Merge remote-tracking branch 'luzero/segment'

[ffmpeg] / libavformat / bintext.c

diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index a0a1f21b870ba2f4a7c5507d1cfe47aa5a76e5ed..e03a31e447483773b7cd621d77dc2787b4da94b2 100644 (file)
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -173,7 +173,6 @@ static int xbin_read_header(AVFormatContext *s,
     BinDemuxContext *bin = s->priv_data;
     ByteIOContext *pb = s->pb;
     char fontheight, flags;
-    uint8_t *h;
 
     AVStream *st = init_stream(s, ap);
     if (!st)
@@ -193,7 +192,7 @@ static int xbin_read_header(AVFormatContext *s,
         st->codec->extradata_size += fontheight * (flags & 0x10 ? 512 : 256);
     st->codec->codec_id    = flags & 4 ? CODEC_ID_XBIN : CODEC_ID_BINTEXT;
 
-    h = st->codec->extradata = av_malloc(st->codec->extradata_size);
+    st->codec->extradata = av_malloc(st->codec->extradata_size);
     if (!st->codec->extradata)
         return AVERROR(ENOMEM);
     st->codec->extradata[0] = fontheight;
@@ -262,7 +261,9 @@ static const uint8_t idf_magic[] = {
 
 static int idf_probe(AVProbeData *p)
 {
-    if (!memcmp(p->buf, idf_magic, FFMIN(sizeof(idf_magic), p->buf_size)))
+    if (p->buf_size < sizeof(idf_magic))
+        return 0;
+    if (!memcmp(p->buf, idf_magic, sizeof(idf_magic)))
         return AVPROBE_SCORE_MAX;
     return 0;
 }