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

Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'

Browse Source 
* commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa':
  rtpdec_mpeg4: Check the return value from malloc
  srtp: Mark a few variables as uninitialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-16 12:13:10 +01:00
commit 1459f34251
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtpdec_mpeg4.c
View File

@ -137,6 +137,8 @@ static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf)
if (!data->au_headers || data->au_headers_allocated < data->nb_au_headers) { if (!data->au_headers || data->au_headers_allocated < data->nb_au_headers) {
av_free(data->au_headers); av_free(data->au_headers);
data->au_headers = av_malloc(sizeof(struct AUHeaders) * data->nb_au_headers); data->au_headers = av_malloc(sizeof(struct AUHeaders) * data->nb_au_headers);
if (!data->au_headers)
return AVERROR(ENOMEM);
data->au_headers_allocated = data->nb_au_headers; data->au_headers_allocated = data->nb_au_headers;
} }
@ -162,6 +164,7 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data,
const uint8_t *buf, int len, uint16_t seq, const uint8_t *buf, int len, uint16_t seq,
int flags) int flags)
{ {
int ret;
if (rtp_parse_mp4_au(data, buf)) if (rtp_parse_mp4_au(data, buf))
return -1; return -1;
@ -170,7 +173,8 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data,
/* XXX: Fixme we only handle the case where rtp_parse_mp4_au define /* XXX: Fixme we only handle the case where rtp_parse_mp4_au define
one au_header */ one au_header */
av_new_packet(pkt, data->au_headers[0].size); if ((ret = av_new_packet(pkt, data->au_headers[0].size)) < 0)
return ret;
memcpy(pkt->data, buf, data->au_headers[0].size); memcpy(pkt->data, buf, data->au_headers[0].size);
pkt->stream_index = st->index; pkt->stream_index = st->index;

4
libavformat/srtp.c
View File

@ -121,8 +121,8 @@ int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr)
{ {
uint8_t iv[16] = { 0 }, hmac[20]; uint8_t iv[16] = { 0 }, hmac[20];
int len = *lenptr; int len = *lenptr;
int ext, seq_largest; int ext, av_uninit(seq_largest);
uint32_t ssrc, roc; uint32_t ssrc, av_uninit(roc);
uint64_t index; uint64_t index;
int rtcp; int rtcp;