aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-11 03:33:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-25 21:09:14 +0200
commit7450a0215ae2242e497a334eef788b1acb581e7e (patch)
treefa84ce06ed503189d66c85382209ae2a68ae1868
parentba10ea845f413d0dff45c8c5381b48f78155f5dc (diff)
downloadffmpeg-7450a0215ae2242e497a334eef788b1acb581e7e.tar.gz
ffprobe: fix use of uninitialized pointer in av_strtok()
Fixes CID733837 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4334ba043e9601717af3a7ca46addfaf154d5fb6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffprobe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffprobe.c b/ffprobe.c
index ca6133e323..48c813a17c 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1790,6 +1790,10 @@ int main(int argc, char **argv)
if (!print_format)
print_format = av_strdup("default");
+ if (!print_format) {
+ ret = AVERROR(ENOMEM);
+ goto end;
+ }
w_name = av_strtok(print_format, "=", &buf);
w_args = buf;