applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

system/region: Prevent preview crash from accessing invalid pointer

Browse source 
In !2051, we switch back to real locale before setting the label text,
however, according to nl_langinfo's manpage, the returned pointer could
be invalid after switching locale or creating new locale, so the program
may crash.

To fix this, we save the result before switching locale, so we won't
access the invalid pointer after switching locale.
This commit is contained in:
Alynx Zhou 2024-01-04 10:29:49 +08:00
parent 0a8e61c9eb
commit 9670d032e7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
panels/region/cc-format-preview.c
View file

@ -69,6 +69,7 @@ update_format_examples (CcFormatPreview *self)
g_autofree gchar *s = NULL;
#ifdef LC_MEASUREMENT
const gchar *fmt;
gboolean is_imperial = FALSE;
#endif
g_autoptr(GtkPaperSize) paper = NULL;
@ -133,6 +134,9 @@ update_format_examples (CcFormatPreview *self)
old_locale = uselocale (locale);
fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT);
/* The returned pointer of nl_langinfo could be invalid after switching
locale, so we must use it here. */
is_imperial = fmt && *fmt == 2;
if (locale != (locale_t) 0)
{
@ -140,7 +144,7 @@ update_format_examples (CcFormatPreview *self)
freelocale (locale);
}
if (fmt && *fmt == 2)
if (is_imperial)
gtk_label_set_text (GTK_LABEL (self->measurement_format_label), C_("measurement format", "Imperial"));
else
gtk_label_set_text (GTK_LABEL (self->measurement_format_label), C_("measurement format", "Metric"));