fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-06 23:28:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xkb: preserve buffer on realloc failure

Browse source 
_Concat() stored the realloc() result directly in its input pointer, so
an allocation failure could drop the only reference to the original
buffer when callers assigned the return value back to their destination
pointer.

Keep the old pointer until realloc() succeeds, avoiding the leak
reported by static analysis.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Mikhail Dmitrichenko <m.dmitrichenko222@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2221>
This commit is contained in:
Mikhail Dmitrichenko 2026-05-25 12:46:28 +03:00
parent ab0a7dacad
commit d6c462f599
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xkb/maprules.c
View file

@ -470,15 +470,19 @@ CheckLine(InputLine * line,
static char *
_Concat(char *str1, const char *str2)
{
int len;
size_t len;
char *tmp;
if ((!str1) || (!str2))
return str1;
len = strlen(str1) + strlen(str2) + 1;
str1 = realloc(str1, len * sizeof(char));
if (str1)
strcat(str1, str2);
return str1;
tmp = realloc(str1, len);
if (!tmp)
return str1;
strcat(tmp, str2);
return tmp;
}
static void