|
| 1 | +From e52fbaf44f038b60f793e1933688e613e7e1974c Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Mon, 9 Jun 2025 14:19:42 -0400 |
| 4 | +Subject: [PATCH] Address CVE-2025-4373 |
| 5 | +Upstream Patch Reference: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4588.patch |
| 6 | +--- |
| 7 | + glib/gstring.c | 36 +++++++++++++++++++++++------------- |
| 8 | + 1 file changed, 23 insertions(+), 13 deletions(-) |
| 9 | + |
| 10 | +diff --git a/glib/gstring.c b/glib/gstring.c |
| 11 | +index 0a509e5..d6f8735 100644 |
| 12 | +--- a/glib/gstring.c |
| 13 | ++++ b/glib/gstring.c |
| 14 | +@@ -424,8 +424,9 @@ g_string_insert_len (GString *string, |
| 15 | + return string; |
| 16 | + |
| 17 | + if (len < 0) |
| 18 | +- len = strlen (val); |
| 19 | +- len_unsigned = len; |
| 20 | ++ len_unsigned = strlen (val); |
| 21 | ++ else |
| 22 | ++ len_unsigned = len; |
| 23 | + |
| 24 | + if (pos < 0) |
| 25 | + pos_unsigned = string->len; |
| 26 | +@@ -723,10 +724,12 @@ g_string_insert_c (GString *string, |
| 27 | + g_string_maybe_expand (string, 1); |
| 28 | + |
| 29 | + if (pos < 0) |
| 30 | +- pos = string->len; |
| 31 | ++ pos_unsigned = string->len; |
| 32 | + else |
| 33 | +- g_return_val_if_fail ((gsize) pos <= string->len, string); |
| 34 | +- pos_unsigned = pos; |
| 35 | ++ { |
| 36 | ++ pos_unsigned = pos; |
| 37 | ++ g_return_val_if_fail (pos_unsigned <= string->len, string); |
| 38 | ++ } |
| 39 | + |
| 40 | + /* If not just an append, move the old stuff */ |
| 41 | + if (pos_unsigned < string->len) |
| 42 | +@@ -759,6 +762,7 @@ g_string_insert_unichar (GString *string, |
| 43 | + gssize pos, |
| 44 | + gunichar wc) |
| 45 | + { |
| 46 | ++ gsize pos_unsigned; |
| 47 | + gint charlen, first, i; |
| 48 | + gchar *dest; |
| 49 | + |
| 50 | +@@ -800,15 +804,18 @@ g_string_insert_unichar (GString *string, |
| 51 | + g_string_maybe_expand (string, charlen); |
| 52 | + |
| 53 | + if (pos < 0) |
| 54 | +- pos = string->len; |
| 55 | ++ pos_unsigned = string->len; |
| 56 | + else |
| 57 | +- g_return_val_if_fail ((gsize) pos <= string->len, string); |
| 58 | ++ { |
| 59 | ++ pos_unsigned = pos; |
| 60 | ++ g_return_val_if_fail (pos_unsigned <= string->len, string); |
| 61 | ++ } |
| 62 | + |
| 63 | + /* If not just an append, move the old stuff */ |
| 64 | +- if ((gsize) pos < string->len) |
| 65 | +- memmove (string->str + pos + charlen, string->str + pos, string->len - pos); |
| 66 | ++ if (pos_unsigned < string->len) |
| 67 | ++ memmove (string->str + pos_unsigned + charlen, string->str + pos_unsigned, string->len - pos_unsigned); |
| 68 | + |
| 69 | +- dest = string->str + pos; |
| 70 | ++ dest = string->str + pos_unsigned; |
| 71 | + /* Code copied from g_unichar_to_utf() */ |
| 72 | + for (i = charlen - 1; i > 0; --i) |
| 73 | + { |
| 74 | +@@ -866,6 +873,7 @@ g_string_overwrite_len (GString *string, |
| 75 | + const gchar *val, |
| 76 | + gssize len) |
| 77 | + { |
| 78 | ++ gssize len_unsigned; |
| 79 | + gsize end; |
| 80 | + |
| 81 | + g_return_val_if_fail (string != NULL, NULL); |
| 82 | +@@ -877,14 +885,16 @@ g_string_overwrite_len (GString *string, |
| 83 | + g_return_val_if_fail (pos <= string->len, string); |
| 84 | + |
| 85 | + if (len < 0) |
| 86 | +- len = strlen (val); |
| 87 | ++ len_unsigned = strlen (val); |
| 88 | ++ else |
| 89 | ++ len_unsigned = len; |
| 90 | + |
| 91 | +- end = pos + len; |
| 92 | ++ end = pos + len_unsigned; |
| 93 | + |
| 94 | + if (end > string->len) |
| 95 | + g_string_maybe_expand (string, end - string->len); |
| 96 | + |
| 97 | +- memcpy (string->str + pos, val, len); |
| 98 | ++ memcpy (string->str + pos, val, len_unsigned); |
| 99 | + |
| 100 | + if (end > string->len) |
| 101 | + { |
| 102 | +-- |
| 103 | +2.34.1 |
| 104 | + |
0 commit comments