highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/avc: free buffer in ff_isom_write_avcc on failure

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-24 20:26:08 -03:00
parent df20619b64
commit d5af8afbe4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avc.c
View File

@ -145,8 +145,10 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len)
buf += size; buf += size;
} }
if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) {
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail;
}
avio_w8(pb, 1); /* version */ avio_w8(pb, 1); /* version */
avio_w8(pb, sps[1]); /* profile */ avio_w8(pb, sps[1]); /* profile */
@ -160,9 +162,11 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len)
avio_w8(pb, 1); /* number of pps */ avio_w8(pb, 1); /* number of pps */
avio_wb16(pb, pps_size); avio_wb16(pb, pps_size);
avio_write(pb, pps, pps_size); avio_write(pb, pps, pps_size);
fail:
av_free(start); av_free(start);
return 0; return ret;
} }
int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size) int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size)