luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 22:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Protect against strcmp() on NULL strings

Browse Source
This commit is contained in:
Sebastian Dröge 2012-11-28 16:25:43 +01:00
parent fca30c3e16
commit 058fa6393e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/ggettext.c
View File

@ -335,10 +335,11 @@ _g_dgettext_should_translate (void)
* - If locale is "C", maybe user calls setlocale(LC_ALL,"") later. * - If locale is "C", maybe user calls setlocale(LC_ALL,"") later.
* Continue with old behavior of translating. * Continue with old behavior of translating.
*/ */
if (0 != strcmp (default_domain, "messages") && if (!default_domain || !translator_comment || !translate_locale ||
(0 != strcmp (default_domain, "messages") &&
'\0' == *translator_comment && '\0' == *translator_comment &&
0 != strncmp (translate_locale, "en_", 3) && 0 != strncmp (translate_locale, "en_", 3) &&
0 != strcmp (translate_locale, "C")) 0 != strcmp (translate_locale, "C")))
should_translate = FALSE; should_translate = FALSE;
g_once_init_leave (&translate, g_once_init_leave (&translate,