d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Back out rev 1.4 - reallocf() failure clobbers existing `environ'.

Browse Source 
o Do not override `environ' if realloc() fails, leave it intact.
o Set `alloced' only when memory is actually allocated.

PR:		bin/5604 (2nd part)
Reviewed by:	bde
This commit is contained in:
Ruslan Ermilov 2000-01-27 16:12:03 +00:00
parent f669e3af26
commit 7e20508477
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=56676
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libc/stdlib/setenv.c
View File

@ -32,7 +32,10 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)setenv.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] = "$FreeBSD$";
#endif /* LIBC_SCCS and not lint */
#include <stddef.h>
@ -73,16 +76,18 @@ setenv(name, value, rewrite)
for (p = environ, cnt = 0; *p; ++p, ++cnt);
if (alloced) { /* just increase size */
environ = (char **)reallocf((char *)environ,
p = (char **)realloc((char *)environ,
(size_t)(sizeof(char *) * (cnt + 2)));
if (!environ)
if (!p)
return (-1);
environ = p;
}
else { /* get new space */
alloced = 1; /* copy old entries into it */
/* copy old entries into it */
p = malloc((size_t)(sizeof(char *) * (cnt + 2)));
if (!p)
return (-1);
alloced = 1;
bcopy(environ, p, cnt * sizeof(char *));
environ = p;
}