diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-08 15:39:53 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-08 15:39:53 +0000 |
commit | 694f18ea461bbf62f6be87df073634bbe0c4f4bd (patch) | |
tree | eba687585c79215d1442e5c3c541a62a1eab3919 /libaf | |
parent | 93ffd2ad797276602041d32703a691d358297bae (diff) | |
download | mpv-694f18ea461bbf62f6be87df073634bbe0c4f4bd.tar.bz2 mpv-694f18ea461bbf62f6be87df073634bbe0c4f4bd.tar.xz |
fix memory leak when filter with given name does not exist.
Also prints which filter failed in the malloc-failed case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17781 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
-rw-r--r-- | libaf/af.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libaf/af.c b/libaf/af.c index cecb9f469f..04aa285743 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -104,7 +104,7 @@ af_instance_t* af_create(af_stream_t* s, char* name) af_instance_t* new=malloc(sizeof(af_instance_t)); if(!new){ af_msg(AF_MSG_ERROR,"[libaf] Could not allocate memory\n"); - return NULL; + goto err_out; } memset(new,0,sizeof(af_instance_t)); @@ -113,7 +113,7 @@ af_instance_t* af_create(af_stream_t* s, char* name) // Find filter from name if(NULL == (new->info=af_find(name))) - return NULL; + goto err_out; /* Make sure that the filter is not already in the list if it is non-reentrant */ @@ -121,8 +121,7 @@ af_instance_t* af_create(af_stream_t* s, char* name) if(af_get(s,name)){ af_msg(AF_MSG_ERROR,"[libaf] There can only be one instance of" " the filter '%s' in each stream\n",name); - free(new); - return NULL; + goto err_out; } } @@ -139,6 +138,7 @@ af_instance_t* af_create(af_stream_t* s, char* name) return new; } +err_out: free(new); af_msg(AF_MSG_ERROR,"[libaf] Couldn't create or open audio filter '%s'\n", name); |