diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-16 23:56:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-27 17:50:47 +0200 |
| commit | 9b4004c054964a49c7ba44583f4cee22486dd8f2 (patch) | |
| tree | bbbd86856946b22f09ba62d806756ba0750118ce | |
| parent | d39467262d2f34803eccf6b48560b65b37efeee4 (diff) | |
| download | ffmpeg-9b4004c054964a49c7ba44583f4cee22486dd8f2.tar.gz | |
avformat/aadec: Check for scanf() failure
Fixes: use of uninitialized variables
Fixes: blank.aa
Found-by: Chamal De Silva <chamal.desilva@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ed188f6dcdf0935c939ed813cf8745d50742014b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/aadec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/aadec.c b/libavformat/aadec.c index d83f283ffe..e8a6b33e30 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -85,6 +85,7 @@ static int aa_read_header(AVFormatContext *s) AADemuxContext *c = s->priv_data; AVIOContext *pb = s->pb; AVStream *st; + int ret; /* parse .aa header */ avio_skip(pb, 4); // file size @@ -118,8 +119,12 @@ static int aa_read_header(AVFormatContext *s) header_seed = atoi(val); } else if (!strcmp(key, "HeaderKey")) { // this looks like "1234567890 1234567890 1234567890 1234567890" av_log(s, AV_LOG_DEBUG, "HeaderKey is <%s>\n", val); - sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32, + + ret = sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32, &header_key_part[0], &header_key_part[1], &header_key_part[2], &header_key_part[3]); + if (ret != 4) + return AVERROR_INVALIDDATA; + for (idx = 0; idx < 4; idx++) { AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE! } |