From 7414dc2cb3597632994198d67a3555c2a1a3c540 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 16 Jul 2020 12:41:49 -0700 Subject: [PATCH] Clarify memset in set_tz_name * glib/gtimezone.c (set_tz_name): Use size, not NAME_SIZE, to clear the buffer. Suggested by Philip Withnall in: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1533#note_867859 --- glib/gtimezone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glib/gtimezone.c b/glib/gtimezone.c index fcf105703..ff8d99e9a 100644 --- a/glib/gtimezone.c +++ b/glib/gtimezone.c @@ -1465,7 +1465,7 @@ set_tz_name (gchar **pos, gchar *buffer, guint size) if (*pos - name_pos < 3) return FALSE; - memset (buffer, 0, NAME_SIZE); + memset (buffer, 0, size); /* name_pos isn't 0-terminated, so we have to limit the length expressly */ len = *pos - name_pos > size - 1 ? size - 1 : *pos - name_pos; strncpy (buffer, name_pos, len);