diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /stream/cache.c | |
parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/cache.c')
-rw-r--r-- | stream/cache.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/stream/cache.c b/stream/cache.c index 85b78f9038..b2ff1a91c8 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -338,10 +338,8 @@ static int resize_cache(struct priv *s, int64_t size) buffer_size += s->back_size; unsigned char *buffer = malloc(buffer_size); - if (!buffer) { - free(buffer); + if (!buffer) return STREAM_ERROR; - } if (s->buffer) { // Copy & free the old ringbuffer data. |