diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 11:38:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 11:38:49 +0200 |
| commit | 47c5c942f823ed3f9e9bde95e5f05cf55918ab04 (patch) | |
| tree | 07464f06e143fb79355547272a4c674372d1e609 /libavformat/rtpdec_qt.c | |
| parent | f31c36e552663b11c49431745b8e75a0d3000539 (diff) | |
| parent | 1af78b865b66acb8020c54262f12aa41ad47e05c (diff) | |
| download | ffmpeg-47c5c942f823ed3f9e9bde95e5f05cf55918ab04.tar.gz | |
Merge commit '1af78b865b66acb8020c54262f12aa41ad47e05c'
* commit '1af78b865b66acb8020c54262f12aa41ad47e05c':
rtpdec_qt: Add an accidentally removed allocation return value check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_qt.c')
| -rw-r--r-- | libavformat/rtpdec_qt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 565f2c2e75..a7bf544b8f 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -180,6 +180,8 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, av_freep(&qt->pkt.data); av_init_packet(&qt->pkt); qt->pkt.data = av_malloc(alen + FF_INPUT_BUFFER_PADDING_SIZE); + if (!qt->pkt.data) + return AVERROR(ENOMEM); qt->pkt.size = 0; qt->timestamp = *timestamp; } |