Mercurial > mplayer.hg
changeset 30351:b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
even if fork failed.
| author | reimar |
|---|---|
| date | Sat, 23 Jan 2010 10:50:50 +0000 |
| parents | 956cc6a392d7 |
| children | dff74677e2fd |
| files | stream/cache2.c |
| diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/cache2.c Fri Jan 22 23:53:15 2010 +0000 +++ b/stream/cache2.c Sat Jan 23 10:50:50 2010 +0000 @@ -15,6 +15,7 @@ #include <signal.h> #include <sys/types.h> #include <unistd.h> +#include <errno.h> #include "osdep/shmem.h" #include "osdep/timer.h" @@ -284,13 +285,14 @@ void cache_uninit(stream_t *s) { cache_vars_t* c = s->cache_data; - if(!s->cache_pid) return; + if(s->cache_pid) { #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) cache_do_control(s, -2, NULL); #else kill(s->cache_pid,SIGKILL); waitpid(s->cache_pid,NULL,0); #endif + } if(!c) return; #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) free(c->stream); @@ -334,6 +336,8 @@ #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__) if((stream->cache_pid=fork())){ + if ((pid_t)stream->cache_pid == -1) + stream->cache_pid = 0; #else { stream_t* stream2=malloc(sizeof(stream_t)); @@ -351,6 +355,11 @@ } #endif #endif + if (!stream->cache_pid) { + mp_msg(MSGT_CACHE, MSGL_ERR, + "Starting cache process/thread failed: %s.\n", strerror(errno)); + return 0; + } // wait until cache is filled at least prefill_init % mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof);