diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 13:05:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 13:06:26 +0400 |
commit | c74c3fb1420b847056d88b040a451c3c56286357 (patch) | |
tree | e73a6d8c9bf60323eb3ff38072b1cb9bfff24b96 /libavutil | |
parent | ede42109e73a0f836bca1a241369a5108003b91a (diff) | |
parent | 3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7 (diff) |
Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'
* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
mem: Introduce av_reallocp
Conflicts:
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/mem.c | 16 | ||||
-rw-r--r-- | libavutil/mem.h | 19 | ||||
-rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 36 insertions, 1 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index 53eeb19f4c..3da8c29889 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -180,6 +180,22 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) return r; } +int av_reallocp(void *ptr, size_t size) +{ + void **ptrptr = ptr; + void *ret; + + ret = av_realloc(*ptrptr, size); + + if (!ret) { + av_freep(ptr); + return AVERROR(ENOMEM); + } + + *ptrptr = ret; + return 0; +} + void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) diff --git a/libavutil/mem.h b/libavutil/mem.h index 03f7f226ae..b73b72435b 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -128,6 +128,25 @@ void *av_realloc(void *ptr, size_t size) av_alloc_size(2); void *av_realloc_f(void *ptr, size_t nelem, size_t elsize); /** + * Allocate or reallocate a block of memory. + * If *ptr is NULL and size > 0, allocate a new block. If + * size is zero, free the memory block pointed to by ptr. + * @param ptr Pointer to a pointer to a memory block already allocated + * with av_realloc(), or pointer to a pointer to NULL. + * The pointer is updated on success, or freed on failure. + * @param size Size in bytes for the memory block to be allocated or + * reallocated + * @return Zero on success, an AVERROR error code on failure. + * @warning Pointers originating from the av_malloc() family of functions must + * not be passed to av_reallocp(). The former can be implemented using + * memalign() (or other functions), and there is no guarantee that + * pointers from such functions can be passed to realloc() at all. + * The situation is undefined according to POSIX and may crash with + * some libc implementations. + */ +int av_reallocp(void *ptr, size_t size); + +/** * Allocate or reallocate an array. * If ptr is NULL and nmemb > 0, allocate a new block. If * nmemb is zero, free the memory block pointed to by ptr. diff --git a/libavutil/version.h b/libavutil/version.h index 7aec9c0899..c143589f6f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 43 +#define LIBAVUTIL_VERSION_MINOR 44 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |