[SCM] libav/experimental: make av_strdup(NULL) return NULL

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:21:03 UTC 2013


The following commit has been merged in the experimental branch:
commit fdf35f265ac239d8a28d1be58d96a82b219c88b7
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri May 23 12:37:32 2008 +0000

    make av_strdup(NULL) return NULL
    
    Originally committed as revision 13250 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 8062ae8..3eaa366 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -139,11 +139,13 @@ void *av_mallocz(unsigned int size)
 
 char *av_strdup(const char *s)
 {
-    char *ptr;
+    char *ptr= NULL;
+    if(s){
     int len = strlen(s) + 1;
     ptr = av_malloc(len);
     if (ptr)
         memcpy(ptr, s, len);
+    }
     return ptr;
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list