Browse Source

lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy().

Fixes ticket #5857.
tags/n3.2
Carl Eugen Hoyos 8 years ago
parent
commit
c54eef46f9
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/avpacket.c

+ 2
- 1
libavcodec/avpacket.c View File

@@ -139,7 +139,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
pkt->buf = av_buffer_alloc(new_size); pkt->buf = av_buffer_alloc(new_size);
if (!pkt->buf) if (!pkt->buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(pkt->buf->data, pkt->data, pkt->size);
if (pkt->size > 0)
memcpy(pkt->buf->data, pkt->data, pkt->size);
pkt->data = pkt->buf->data; pkt->data = pkt->buf->data;
} }
pkt->size += grow_by; pkt->size += grow_by;


Loading…
Cancel
Save