Fix the logic to access the location of a string to free when setting

[ffmpeg] / libavutil / mem.h

diff --git a/libavutil/mem.h b/libavutil/mem.h
index c68117d43d7124c84e8cb6c8477a66ca476044d3..84d647d8ead861962c1b9751f75b188f85fc5350 100644 (file)
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -42,12 +42,18 @@
     #define DECLARE_ASM_CONST(n,t,v)    static const t v
 #endif
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
     #define av_malloc_attrib __attribute__((__malloc__))
 #else
     #define av_malloc_attrib
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
+    #define av_alloc_size(n) __attribute__((alloc_size(n)))
+#else
+    #define av_alloc_size(n)
+#endif
+
 /**
  * Allocate a block of \p size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU).
@@ -56,7 +62,7 @@
  * it.
  * @see av_mallocz()
  */
-void *av_malloc(unsigned int size) av_malloc_attrib;
+void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);
 
 /**
  * Allocate or reallocate a block of memory.
@@ -70,7 +76,7 @@ void *av_malloc(unsigned int size) av_malloc_attrib;
  * reallocate or the function is used to free the memory block.
  * @see av_fast_realloc()
  */
-void *av_realloc(void *ptr, unsigned int size);
+void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);
 
 /**
  * Free a memory block which has been allocated with av_malloc(z)() or
@@ -91,7 +97,7 @@ void av_free(void *ptr);
  * it.
  * @see av_malloc()
  */
-void *av_mallocz(unsigned int size) av_malloc_attrib;
+void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);
 
 /**
  * Duplicate the string \p s.