10l (double free)

Originally committed as revision 3764 to svn://svn.ffmpeg.org/ffmpeg/trunk
20 years ago · ae895a40c5
parent ed2d7a341e
commit ae895a40c5
1 changed files with 1 additions and 6 deletions
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@ -155,7 +155,6 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)

    st = av_new_stream(s1, 0);
    if (!st) {
-        av_free(s);
        return -ENOMEM;
    }

@ -181,7 +180,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
    
    if (!s->is_pipe) {
        if (find_image_range(&first_index, &last_index, s->path) < 0)
-            goto fail;
+            return AVERROR_IO;
        s->img_first = first_index;
        s->img_last = last_index;
        s->img_number = first_index;
@ -204,10 +203,6 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
    }

    return 0;
- 
- fail:
-    av_free(s);
-    return AVERROR_IO;
 }

 static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)