Skip to content

V
vlc-2-2
Commit f4eb170d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

config_Get*Choices(): deal with empty strings (NULL) correctly

parent 1b8b05c7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/config/core.c
View file @ f4eb170d
...@@ -363,7 +363,8 @@ ssize_t config_GetIntChoices (vlc_object_t *obj, const char *name, ...@@ -363,7 +363,8 @@ ssize_t config_GetIntChoices (vlc_object_t *obj, const char *name,
{ {
vals[i] = cfg->list.i[i]; vals[i] = cfg->list.i[i];
/* FIXME: use module_gettext() instead */ /* FIXME: use module_gettext() instead */
txts[i] = strdup (vlc_gettext (cfg->list_text[i])); txts[i] = strdup ((cfg->list_text[i] != NULL)
? vlc_gettext (cfg->list_text[i]) : "");
if (unlikely(txts[i] == NULL)) if (unlikely(txts[i] == NULL))
abort (); abort ();
} }
...@@ -409,9 +410,10 @@ ssize_t config_GetPszChoices (vlc_object_t *obj, const char *name, ...@@ -409,9 +410,10 @@ ssize_t config_GetPszChoices (vlc_object_t *obj, const char *name,
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
vals[i] = strdup (cfg->list.psz[i]); vals[i] = strdup ((cfg->list.psz[i] != NULL) ? cfg->list.psz[i] : "");
/* FIXME: use module_gettext() instead */ /* FIXME: use module_gettext() instead */
txts[i] = strdup (vlc_gettext(cfg->list_text[i])); txts[i] = strdup ((cfg->list_text[i] != NULL)
? vlc_gettext (cfg->list_text[i]) : "");
if (unlikely(vals[i] == NULL || txts[i] == NULL)) if (unlikely(vals[i] == NULL || txts[i] == NULL))
abort (); abort ();
} }
......
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