Browse Source

nutdec: only copy the header if it exists

Fixes runtime error: null pointer passed as argument 2, which is
declared to never be null

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n3.0
Andreas Cadhalpun Anton Khirnov 9 years ago
parent
commit
9cdddb93bb
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavformat/nutdec.c

+ 2
- 1
libavformat/nutdec.c View File

@@ -890,7 +890,8 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
ret = av_new_packet(pkt, size + nut->header_len[header_idx]);
if (ret < 0)
return ret;
memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]);
if (nut->header[header_idx])
memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]);
pkt->pos = avio_tell(bc); // FIXME
avio_read(bc, pkt->data + nut->header_len[header_idx], size);



Loading…
Cancel
Save