X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fmem.c;h=fa227f5e120f9e9931f6eb06fd56aa1ffbb86e4b;hb=8b83a4a885e3b92bd09354d6cb182fca47f80973;hp=cfb6d8ab8ffa6c6d51f325d4d8bbe7dc0922871f;hpb=4796ec5d4ea00a86f9f6732653469e682e5266da;p=ffmpeg

diff --git a/libavutil/mem.c b/libavutil/mem.c
index cfb6d8ab8ff..fa227f5e120 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -133,14 +133,20 @@ void *av_malloc(size_t size)
 
 void *av_realloc(void *ptr, size_t size)
 {
+    void *ret;
     if (size > max_alloc_size)
         return NULL;
 
 #if HAVE_ALIGNED_MALLOC
-    return _aligned_realloc(ptr, size + !size, ALIGN);
+    ret = _aligned_realloc(ptr, size + !size, ALIGN);
 #else
-    return realloc(ptr, size + !size);
+    ret = realloc(ptr, size + !size);
 #endif
+#if CONFIG_MEMORY_POISONING
+    if (ret && !ptr)
+        memset(ret, FF_MEMORY_POISON, size);
+#endif
+    return ret;
 }
 
 void *av_realloc_f(void *ptr, size_t nelem, size_t elsize)