OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/generic/setenv.c (setenv): Return -1/EINVAL if name is 

NULL, "" or contains '=' character in it.  Reported by
	Michael T Kerrisk <mtk-lists@gmx.net>.
	* stdlib/tst-environ.c: Include errno.h.
	(main): Add tests for these arguments to setenv/unsetenv.
This commit is contained in:
Roland McGrath 2004-06-09 18:33:36 +00:00
parent 616340ca42
commit e17f8b6119
3 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-06-09 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/setenv.c (setenv): Return -1/EINVAL if name is
NULL, "" or contains '=' character in it. Reported by
Michael T Kerrisk <mtk-lists@gmx.net>.
* stdlib/tst-environ.c: Include errno.h.
(main): Add tests for these arguments to setenv/unsetenv.
2004-06-07 Roland McGrath <roland@frob.com>
* NEWS: Update bug reporting instructions. Fix some typos.

47
stdlib/tst-environ.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999 Free Software Foundation, Inc.
/* Copyright (C) 1999, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -16,6 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -173,5 +174,49 @@ main (void)
result = 1;
}
/* Both setenv and unsetenv should return -1/EINVAL for NULL or "" name
or if name contains '=' character. */
errno = 0;
if (setenv (NULL, "val", 1) >= 0 || errno != EINVAL)
{
puts ("setenv #4 failed");
result = 1;
}
errno = 0;
if (setenv ("", "val", 0) >= 0 || errno != EINVAL)
{
puts ("setenv #5 failed");
result = 1;
}
errno = 0;
if (setenv ("var=val", "val", 1) >= 0 || errno != EINVAL)
{
puts ("setenv #6 failed");
result = 1;
}
errno = 0;
if (unsetenv (NULL) >= 0 || errno != EINVAL)
{
puts ("unsetenv #1 failed");
result = 1;
}
errno = 0;
if (unsetenv ("") >= 0 || errno != EINVAL)
{
puts ("unsetenv #2 failed");
result = 1;
}
errno = 0;
if (unsetenv ("x=y") >= 0 || errno != EINVAL)
{
puts ("unsetenv #3 failed");
result = 1;
}
return result;
}

6
sysdeps/generic/setenv.c
View File

@ -265,6 +265,12 @@ setenv (name, value, replace)
const char *value;
int replace;
{
if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
{
__set_errno (EINVAL);
return -1;
}
return __add_to_environ (name, value, NULL, replace);
}