ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

strutils: fix double free in strrealloc() [coverity scan] 

* fix double free
* keep strrealloc() semantic compatible with classic realloc() (do not
  free original pointer on failed memory allocation).
* remove unnecessary goto

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2020-01-15 12:58:29 +01:00
parent 319029e8b4
commit 01aedbecfe
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/strutils.h
View File

@ -93,7 +93,9 @@ static inline char *mem2strcpy(char *dest, const void *src, size_t n, size_t nma
return dest;
}
/* Reallocate @str according to @newstr and copy @newstr to @str; returns new @str */
/* Reallocate @str according to @newstr and copy @newstr to @str; returns new @str.
* The @str is not modified if reallocation failed (like classic realloc()).
*/
static inline char * __attribute__((warn_unused_result))
strrealloc(char *str, const char *newstr)
{
@ -101,27 +103,17 @@ strrealloc(char *str, const char *newstr)
if (!str)
return newstr ? strdup(newstr) : NULL;
if (!newstr) {
free(str);
goto nothing;
}
if (!newstr)
return NULL;
osz = strlen(str);
nsz = strlen(newstr);
if (nsz > osz) {
char *tmp = realloc(str, nsz + 1);
if (!tmp)
goto nothing;
str = tmp;
}
memcpy(str, newstr, nsz + 1);
if (nsz > osz)
str = realloc(str, nsz + 1);
if (str)
memcpy(str, newstr, nsz + 1);
return str;
nothing:
free(str);
return NULL;
}
/* Copy string @str to struct @stru to member addressed by @offset */