Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3'

* commit '8ddc32629a6d6be77256694c9e322dde134609f3':
  mem: add av_strndup() for duplicating substrings

Conflicts:
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 20 insertions, 0 deletions

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 8226168eed..35a82e8a2d 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -267,6 +267,26 @@ char *av_strdup(const char *s)
     return ptr;
 }
 
+char *av_strndup(const char *s, size_t len)
+{
+    char *ret = NULL, *end;
+
+    if (!s)
+        return NULL;
+
+    end = memchr(s, 0, len);
+    if (end)
+        len = end - s;
+
+    ret = av_realloc(NULL, len + 1);
+    if (!ret)
+        return NULL;
+
+    memcpy(ret, s, len);
+    ret[len] = 0;
+    return ret;
+}
+
 void *av_memdup(const void *p, size_t size)
 {
     void *ptr = NULL;