mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	core: relex validity checks when destructing half-set up source outputs/sink inputs
This commit is contained in:
		
							parent
							
								
									5b0683d6cd
								
							
						
					
					
						commit
						1a05d67f07
					
				
					 2 changed files with 4 additions and 3 deletions
				
			
		| 
						 | 
					@ -487,7 +487,10 @@ static void sink_input_free(pa_object *o) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_log_info("Freeing input %u \"%s\"", i->index, pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME)));
 | 
					    pa_log_info("Freeing input %u \"%s\"", i->index, pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_assert(!i->thread_info.attached);
 | 
					    /* Side note: this function must be able to destruct properly any
 | 
				
			||||||
 | 
					     * kind of sink input in any state, even those which are
 | 
				
			||||||
 | 
					     * "half-moved" or are connected to sinks that have no asyncmsgq
 | 
				
			||||||
 | 
					     * and are hence half-destructed themselves! */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (i->thread_info.render_memblockq)
 | 
					    if (i->thread_info.render_memblockq)
 | 
				
			||||||
        pa_memblockq_free(i->thread_info.render_memblockq);
 | 
					        pa_memblockq_free(i->thread_info.render_memblockq);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -359,8 +359,6 @@ static void source_output_free(pa_object* mo) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_log_info("Freeing output %u \"%s\"", o->index, pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_MEDIA_NAME)));
 | 
					    pa_log_info("Freeing output %u \"%s\"", o->index, pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_MEDIA_NAME)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_assert(!o->thread_info.attached);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (o->thread_info.delay_memblockq)
 | 
					    if (o->thread_info.delay_memblockq)
 | 
				
			||||||
        pa_memblockq_free(o->thread_info.delay_memblockq);
 | 
					        pa_memblockq_free(o->thread_info.delay_memblockq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue