diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:48:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:48:14 +0200 |
| commit | 77510a96986176b1be791944861e3a6e44abd3d1 (patch) | |
| tree | 0efb29973242871c14e5bd3908bb621c9a09b6bd | |
| parent | d1f7b313ac3476e4b00f550e470f9f8429919299 (diff) | |
| parent | bc1eace1b3654c490cb2c226b3c80854244dbb9a (diff) | |
| download | ffmpeg-77510a96986176b1be791944861e3a6e44abd3d1.tar.gz | |
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/jack.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavdevice/jack.c b/libavdevice/jack.c index df829ad45a..917534d9ec 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -200,6 +200,10 @@ static int start_jack(AVFormatContext *context) self->filled_pkts = av_fifo_alloc_array(FIFO_PACKETS_NUM, sizeof(AVPacket)); /* New packets FIFO with one extra packet for safety against underruns */ self->new_pkts = av_fifo_alloc_array((FIFO_PACKETS_NUM + 1), sizeof(AVPacket)); + if (!self->new_pkts) { + jack_client_close(self->client); + return AVERROR(ENOMEM); + } if ((test = supply_new_packets(self, context))) { jack_client_close(self->client); return test; |