diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 13:46:29 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 13:46:29 +0300 |
| commit | 1c667626bbbf1e7bde9e7be8cf1a00d0f61580df (patch) | |
| tree | 3a156a704767e8772e923a55e334474c71bde4b0 /libavdevice | |
| parent | a6df9ce61520ad7583a90a20e82d857b8d4fb133 (diff) | |
| parent | 386e2755aab73ae7075f78d92786cb5c5419597a (diff) | |
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/jack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavdevice/jack.c b/libavdevice/jack.c index 053dba70a0..df829ad45a 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -165,6 +165,8 @@ static int start_jack(AVFormatContext *context) self->sample_rate = jack_get_sample_rate(self->client); self->ports = av_malloc_array(self->nports, sizeof(*self->ports)); + if (!self->ports) + return AVERROR(ENOMEM); self->buffer_size = jack_get_buffer_size(self->client); /* Register JACK ports */ |