[git commit] add argument check in setenv()

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jan 23 19:59:27 UTC 2015


commit: http://git.uclibc.org/uClibc/commit/?id=217f0a86c07beae6a27d422b5f46ee853f3a447a
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

setenv() in glibc/eglibc will check the argument, like this,
  ...
  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
    {
      __set_errno (EINVAL);
      return -1;
    }
  ...
So add argument check in uclibc's setenv() too.

Signed-off-by: Xishi Qiu <qiuxishi at huawei.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/stdlib/setenv.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c
index f3b53b6..ecc3025 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -41,7 +41,7 @@ static char **last_environ;
    to reuse values once generated for a `setenv' call since we can never
    free the strings. [in uclibc, we do not]  */
 static int __add_to_environ(const char *name, const char *value,
- 		int replace)
+		int replace)
 {
 	register char **ep;
 	register size_t size;
@@ -116,6 +116,11 @@ static int __add_to_environ(const char *name, const char *value,
 
 int setenv(const char *name, const char *value, int replace)
 {
+	if (name == NULL || *name == '\0' || strchr (name, '=') != NULL) {
+		__set_errno(EINVAL);
+		return -1;
+	}
+
 	/* NB: setenv("VAR", NULL, 1) inserts "VAR=" string */
 	return __add_to_environ(name, value ? value : "", replace);
 }


More information about the uClibc-cvs mailing list