[FFmpeg-cvslog] avutil/mem: Fix invalid use of av_alloc_size

Mark Harris git at videolan.org
Tue Jul 23 07:24:42 EEST 2019


ffmpeg | branch: release/3.1 | Mark Harris <mark.hsj at gmail.com> | Sat Nov 24 13:02:02 2018 -0800| [6f6cd2e29df5ba0c957772a101790db22c7cab94] | committer: James Almer

avutil/mem: Fix invalid use of av_alloc_size

The alloc_size attribute is valid only on functions that return a
pointer.  GCC 9 (not yet released) warns about invalid usage:

./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes]
  342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
      | ^~~~~~~~~~~~~

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 4361293fcf59edb56879c36edcd25f0a91e0edf8)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f6cd2e29df5ba0c957772a101790db22c7cab94
---

 libavutil/mem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/mem.h b/libavutil/mem.h
index d25b3229b7..376fd2e07c 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -183,7 +183,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
  *          The situation is undefined according to POSIX and may crash with
  *          some libc implementations.
  */
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
 
 /**
  * Free a memory block which has been allocated with av_malloc(z)() or



More information about the ffmpeg-cvslog mailing list