luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-12-18 14:19:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3845-file-attribute-maths' into 'main'

Browse Source 
gfileattribute: Fix integer overflow calculating escaping for byte strings

Closes #3845

See merge request GNOME/glib!4935
This commit is contained in:
Philip Withnall
2025-12-05 18:06:13 +00:00
parent effe6916c5 1909d8ea92
commit 60d90f13dd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gfileattribute.c
View File

@@ -22,6 +22,7 @@
#include "config.h"
#include <stdint.h>
#include <string.h>
#include "gfileattribute.h"
@@ -166,11 +167,12 @@ valid_char (char c)
return c >= 32 && c <= 126 && c != '\\';
}
/* Returns NULL on error */
static char *
escape_byte_string (const char *str)
{
size_t i, len;
int num_invalid;
size_t num_invalid;
char *escaped_val, *p;
unsigned char c;
const char hex_digits[] = "0123456789abcdef";
@@ -188,6 +190,11 @@ escape_byte_string (const char *str)
return g_strdup (str);
else
{
/* Check for overflow. We want to check the inequality:
* !(len + num_invalid * 3 + 1 > SIZE_MAX) */
if (num_invalid >= (SIZE_MAX - len) / 3)
return NULL;
escaped_val = g_malloc (len + num_invalid * 3 + 1);
p = escaped_val;