virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

nutdec: only copy the header if it exists

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

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 9f82506c79)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2015-12-18 15:18:47 +01:00
parent 5b88d24f24
commit 7f320ed15d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/nutdec.c
View File

@ -1126,7 +1126,8 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
ret = av_new_packet(pkt, size + nut->header_len[header_idx]); ret = av_new_packet(pkt, size + nut->header_len[header_idx]);
if (ret < 0) if (ret < 0)
return ret; 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 pkt->pos = avio_tell(bc); // FIXME
if (stc->last_flags & FLAG_SM_DATA) { if (stc->last_flags & FLAG_SM_DATA) {
int sm_size; int sm_size;