]> git.sesse.net Git - vlc/commitdiff
var_CreateGetString must return NULL in case of error
authorRafaël Carré <funman@videolan.org>
Fri, 30 May 2008 14:52:41 +0000 (16:52 +0200)
committerRafaël Carré <funman@videolan.org>
Fri, 30 May 2008 14:52:54 +0000 (16:52 +0200)
include/vlc_variables.h

index b553a7c3b2fba8f1f44336579b6b59feb084c267..ecd997e382ac216bb5ecbd4f3a60e656f71842f7 100644 (file)
@@ -359,10 +359,10 @@ static inline float __var_GetFloat( vlc_object_t *p_obj, const char *psz_name )
 static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val; val.psz_string = NULL;
-    if( !__var_Get( p_obj, psz_name, &val ) )
-        return val.psz_string;
+    if( __var_Get( p_obj, psz_name, &val ) )
+        return NULL;
     else
-        return strdup( "" );
+        return val.psz_string;
 }
 
 static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name )