aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2016-11-17 12:11:13 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-17 23:51:21 +0100
commit31c9c7ad826e6dedf8ca615c7d32f6b518ceddea (patch)
treed2c6ce50503ebdcfdb1e58bc6a9c6f75caa9a014
parent08f26d99b52f05a605247a7b3b6507ae6b541ef0 (diff)
downloadffmpeg-31c9c7ad826e6dedf8ca615c7d32f6b518ceddea.tar.gz
ffprobe: fix crash in case -of is specified with an empty string
Fix trac issue #5957. (cherry picked from commit 427a47abcddab15e10ce26d971f712d90c53884b) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--ffprobe.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ffprobe.c b/ffprobe.c
index a2980b338c..79fe296489 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -3311,6 +3311,12 @@ int main(int argc, char **argv)
goto end;
}
w_name = av_strtok(print_format, "=", &buf);
+ if (!w_name) {
+ av_log(NULL, AV_LOG_ERROR,
+ "No name specified for the output format\n");
+ ret = AVERROR(EINVAL);
+ goto end;
+ }
w_args = buf;
if (show_data_hash) {