[FFmpeg-cvslog] nutdec: only copy the header if it exists
Andreas Cadhalpun
git at videolan.org
Wed Jan 27 19:21:56 CET 2016
ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Fri Dec 18 17:24:09 2015 +0100| [9cdddb93bb33c58a5d42239326bc5eae0067366a] | committer: Anton Khirnov
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 at googlemail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cdddb93bb33c58a5d42239326bc5eae0067366a
---
libavformat/nutdec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 17ae522..e39f7d3 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -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);
More information about the ffmpeg-cvslog
mailing list