From 67e285ceca1cb602a5ab87010b30d904527924fe Mon Sep 17 00:00:00 2001
From: Martin Storsjö <martin@martin.st>
Date: Fri, 20 Sep 2013 14:02:41 +0300
Subject: mem: Handle av_reallocp(..., 0) properly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously this did a double free (and returned an error).

Reported-by: Justin Ruggles
Signed-off-by: Martin Storsjö <martin@martin.st>
---
 libavutil/mem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 172180e7b9..b84020c0f9 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -141,6 +141,10 @@ int av_reallocp(void *ptr, size_t size)
     void **ptrptr = ptr;
     void *ret;
 
+    if (!size) {
+        av_freep(ptr);
+        return 0;
+    }
     ret = av_realloc(*ptrptr, size);
 
     if (!ret) {
-- 
cgit v1.2.3