avformat/aviobuf: fix null dereference in avio_close_dyn_buf()

Fixes CID1135769 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 7441d1ec33
parent 0fe6906d96
commit 7441d1ec33
1 changed files with 2 additions and 1 deletions
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@ -1036,7 +1036,7 @@ int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size)

 int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
 {
-    DynBuffer *d = s->opaque;
+    DynBuffer *d;
    int size;
    static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0};
    int padding = 0;
@ -1045,6 +1045,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
        *pbuffer = NULL;
        return 0;
    }
+    d = s->opaque;

    /* don't attempt to pad fixed-size packet buffers */
    if (!s->max_packet_size) {