Skip to content

V
vlc
Commit 13558d8d authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Made var_GetNonEmptyString robust against var_GetString allocation error.

parent 2f1485c1
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/vlc_variables.h
View file @ 13558d8d
...@@ -399,7 +399,7 @@ static inline char *__var_GetNonEmptyString( vlc_object_t *p_obj, const char *ps ...@@ -399,7 +399,7 @@ static inline char *__var_GetNonEmptyString( vlc_object_t *p_obj, const char *ps
vlc_value_t val; vlc_value_t val;
if( var_GetChecked( p_obj, psz_name, VLC_VAR_STRING, &val ) ) if( var_GetChecked( p_obj, psz_name, VLC_VAR_STRING, &val ) )
return NULL; return NULL;
if( *val.psz_string ) if( val.psz_string && *val.psz_string )
return val.psz_string; return val.psz_string;
free( val.psz_string ); free( val.psz_string );
return NULL; return NULL;
......
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