mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 18:16:08 +02:00
Code

Merge branch 'ef/setenv-putenv' into maint 

* ef/setenv-putenv:
  compat/setenv.c: error if name contains '='
  compat/setenv.c: update errno when erroring out
This commit is contained in:
Junio C Hamano 2011-12-28 11:42:24 -08:00
parent 3c06ab69b1 6ac1b2a3b8
commit e8f6b51a6b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compat/setenv.c
View File

@ -6,7 +6,10 @@ int gitsetenv(const char *name, const char *value, int replace)
size_t namelen, valuelen;
char *envstr;
if (!name || !value) return -1;
if (!name || strchr(name, '=') || !value) {
errno = EINVAL;
return -1;
}
if (!replace) {
char *oldval = NULL;
oldval = getenv(name);
@ -16,7 +19,10 @@ int gitsetenv(const char *name, const char *value, int replace)
namelen = strlen(name);
valuelen = strlen(value);
envstr = malloc((namelen + valuelen + 2));
if (!envstr) return -1;
if (!envstr) {
errno = ENOMEM;
return -1;
}
memcpy(envstr, name, namelen);
envstr[namelen] = '=';