Mercurial > mplayer.hg
comparison stream/cache2.c @ 30352:dff74677e2fd
Zero freed pointers.
author | reimar |
---|---|
date | Sat, 23 Jan 2010 10:53:28 +0000 |
parents | b985db55e78a |
children | 3c131287a33e |
comparison
equal
deleted
inserted
replaced
30351:b985db55e78a | 30352:dff74677e2fd |
---|---|
290 cache_do_control(s, -2, NULL); | 290 cache_do_control(s, -2, NULL); |
291 #else | 291 #else |
292 kill(s->cache_pid,SIGKILL); | 292 kill(s->cache_pid,SIGKILL); |
293 waitpid(s->cache_pid,NULL,0); | 293 waitpid(s->cache_pid,NULL,0); |
294 #endif | 294 #endif |
295 s->cache_pid = 0; | |
295 } | 296 } |
296 if(!c) return; | 297 if(!c) return; |
297 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) | 298 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) |
298 free(c->stream); | 299 free(c->stream); |
299 free(c->buffer); | 300 free(c->buffer); |
300 free(s->cache_data); | 301 free(s->cache_data); |
301 #else | 302 #else |
302 shmem_free(c->buffer,c->buffer_size); | 303 shmem_free(c->buffer,c->buffer_size); |
303 shmem_free(s->cache_data,sizeof(cache_vars_t)); | 304 shmem_free(s->cache_data,sizeof(cache_vars_t)); |
304 #endif | 305 #endif |
306 c->buffer = NULL; | |
307 s->cache_data = NULL; | |
305 } | 308 } |
306 | 309 |
307 static void exit_sighandler(int x){ | 310 static void exit_sighandler(int x){ |
308 // close stream | 311 // close stream |
309 exit(0); | 312 exit(0); |