luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext2spice: mergeAttr() fix, leak removal and restore original intention

This commit is contained in:
Darryl L. Miles 2025-02-24 08:31:42 +00:00 committed by R. Timothy Edwards
parent b3617f603d
commit e7c46102d6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext2spice/ext2spice.c
View File

@ -4252,11 +4252,11 @@ mergeAttr(a1, a2)
*a1 = *a2;
else
{
char *t;
int l1 = strlen(*a1);
int l2 = strlen(*a2);
t = (char *) mallocMagic((unsigned int)((l1 + l2) + 1));
t = (char *) strcat(*a1, *a2);
size_t l1 = strlen(*a1);
size_t l2 = strlen(*a2);
char *t = (char *) mallocMagic(l1 + l2 + 1);
strcpy(t, *a1); /* strcpy_advance() */
strcat(t, *a2);
freeMagic(*a1);
*a1 = t;
}