Browse Source

avcodec/avpacket: fix order of operations in case of too large allocation

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
e50278348a
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/avpacket.c

+ 3
- 1
libavcodec/avpacket.c View File

@@ -442,9 +442,11 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size)
const size_t new_size = *size + keylen + 1 + valuelen + 1;
uint8_t *const new_data = av_realloc(data, new_size);

if (!new_data || new_size > INT_MAX)
if (!new_data)
goto fail;
data = new_data;
if (new_size > INT_MAX)
goto fail;

memcpy(data + *size, t->key, keylen + 1);
memcpy(data + *size + keylen + 1, t->value, valuelen + 1);


Loading…
Cancel
Save