Hi
The attached patch adds av_calloc() to libavutil.
See the mxfdec thread ("[PATCH] mxfdec: replace x>>av_log2(sizeof(..))
by x/sizeof(..)"). This allows for simpler, smaller code and smaller
binaries.
/Tomas
>From f614808c28a58c14906c81962871d2c2dfc73afe Mon Sep 17 00:00:00 2001
From: Laurent Aimar <[email protected]>
Date: Sat, 24 Sep 2011 18:39:13 +0200
Subject: [PATCH 1/2] Add av_calloc() helper.
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavutil/mem.c | 7 +++++++
libavutil/mem.h | 12 ++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/libavutil/mem.c b/libavutil/mem.c
index 0fe9f54..45b024d 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -167,6 +167,13 @@ void *av_mallocz(size_t size)
return ptr;
}
+void *av_calloc(size_t nmemb, size_t size)
+{
+ if (size <= 0 || nmemb >= INT_MAX / size)
+ return NULL;
+ return av_mallocz(nmemb * size);
+}
+
char *av_strdup(const char *s)
{
char *ptr= NULL;
diff --git a/libavutil/mem.h b/libavutil/mem.h
index cd8490b..042bbaf 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -113,6 +113,18 @@ void av_free(void *ptr);
void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
/**
+ * Allocate a block of nmemb * size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * The allocation will fail if nmemb * size is greater than or equal
+ * to INT_MAX.
+ * @param nmemb
+ * @param size
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ */
+void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+
+/**
* Duplicate the string s.
* @param s string to be duplicated
* @return Pointer to a newly allocated string containing a
--
1.7.5.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
