Skip to content

V
vlc
Commit 6f1a3e53 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

var_CreateGetString must return NULL in case of error

parent 0a3bbd16
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
include/vlc_variables.h
View file @ 6f1a3e53
...@@ -359,10 +359,10 @@ static inline float __var_GetFloat( vlc_object_t *p_obj, const char *psz_name ) ...@@ -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 ) static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
{ {
vlc_value_t val; val.psz_string = NULL; vlc_value_t val; val.psz_string = NULL;
if( !__var_Get( p_obj, psz_name, &val ) ) if( __var_Get( p_obj, psz_name, &val ) )
return val.psz_string; return NULL;
else else
return strdup( "" ); return val.psz_string;
} }
static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name ) static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment