generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg_opt: Fix memleaks in "manually set programs" loop

Browse Source 
Fixes CID1351356, CID1351357

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-02-08 15:23:51 +01:00
parent 35d9441f7b
commit a25c5dbb5e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ffmpeg_opt.c
View File

@ -2366,18 +2366,25 @@ loop_end:
while(*p) { while(*p) {
const char *p2 = av_get_token(&p, ":"); const char *p2 = av_get_token(&p, ":");
const char *to_dealloc = p2;
char *key; char *key;
if (!p2) if (!p2)
break; break;
if(*p) p++; if(*p) p++;
key = av_get_token(&p2, "="); key = av_get_token(&p2, "=");
if (!key || !*p2) if (!key || !*p2) {
av_freep(&to_dealloc);
av_freep(&key);
break; break;
}
p2++; p2++;
if (!strcmp(key, "program_num")) if (!strcmp(key, "program_num"))
progid = strtol(p2, NULL, 0); progid = strtol(p2, NULL, 0);
av_freep(&to_dealloc);
av_freep(&key);
} }
program = av_new_program(oc, progid); program = av_new_program(oc, progid);
@ -2385,6 +2392,7 @@ loop_end:
p = o->program[i].u.str; p = o->program[i].u.str;
while(*p) { while(*p) {
const char *p2 = av_get_token(&p, ":"); const char *p2 = av_get_token(&p, ":");
const char *to_dealloc = p2;
char *key; char *key;
if (!p2) if (!p2)
break; break;
@ -2411,6 +2419,8 @@ loop_end:
av_log(NULL, AV_LOG_FATAL, "Unknown program key %s.\n", key); av_log(NULL, AV_LOG_FATAL, "Unknown program key %s.\n", key);
exit_program(1); exit_program(1);
} }
av_freep(&to_dealloc);
av_freep(&key);
} }
} }