JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct argz_replace behaviour when memory is exhausted.

Browse Source 
* libc/argz/argz_replace.c (argz_replace): Correct behaviour when memory
	is exhausted.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
David Stacey 2015-06-01 10:09:04 +02:00 committed by Corinna Vinschen
parent 30cffa234b
commit 8fe35bd15f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2015-05-31 David Stacey <drstacey@tiscali.co.uk>
* libc/argz/argz_replace.c (argz_replace): Correct behaviour when memory
is exhausted.
2015-05-28 Corinna Vinschen <vinschen@redhat.com> 2015-05-28 Corinna Vinschen <vinschen@redhat.com>
* libc/include/sys/wait.h: Fix comment. * libc/include/sys/wait.h: Fix comment.

7
newlib/libc/argz/argz_replace.c
View File

@ -30,6 +30,7 @@ _DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
char *new_argz = NULL; char *new_argz = NULL;
size_t new_argz_len = 0; size_t new_argz_len = 0;
char *new_argz_iter = NULL; char *new_argz_iter = NULL;
char *argz_realloc = NULL;
*replace_count = 0; *replace_count = 0;
new_argz_len = *argz_len; new_argz_len = *argz_len;
@ -45,7 +46,8 @@ _DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
if (*replace_count) if (*replace_count)
{ {
new_argz = (char *)malloc(new_argz_len); if (!(new_argz = (char *)malloc(new_argz_len)))
return ENOMEM;
buf_iter = *argz; buf_iter = *argz;
buf_len = *argz_len; buf_len = *argz_len;
@ -70,11 +72,12 @@ _DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
memcpy(new_argz_iter, last_iter, *argz + *argz_len - last_iter); memcpy(new_argz_iter, last_iter, *argz + *argz_len - last_iter);
/* reallocate argz, and copy over the new value. */ /* reallocate argz, and copy over the new value. */
if(!(*argz = (char *)realloc(*argz, new_argz_len))) if(!(argz_realloc = (char *)realloc(*argz, new_argz_len)))
{ {
free(new_argz); free(new_argz);
return ENOMEM; return ENOMEM;
} }
*argz = argz_realloc;
memcpy(*argz, new_argz, new_argz_len); memcpy(*argz, new_argz, new_argz_len);
*argz_len = new_argz_len; *argz_len = new_argz_len;