Skip to content
Permalink
Browse files

Fix script environment variable setting for empty lists

When setting an environment variable as a space-separated list, and
the list is empty, we must not delete the '=' before the value.

In practice putenv() is likely to discard the invalid string, leaving
the variable unset, but this is not guaranteed.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
bwhacks committed Jan 22, 2016
1 parent 78bc7d9 commit 6326ab374ede4fff1e8019a50d4b9854b8db7625
Showing with 12 additions and 4 deletions.
  1. +12 −4 src/script.c
@@ -105,7 +105,9 @@ static void ipv6_to_env(const char *name,
buf_len += strlen(&buf[buf_len]);
buf[buf_len++] = ' ';
}
buf[buf_len - 1] = '\0';
if (buf[buf_len - 1] == ' ')
buf_len--;
buf[buf_len] = '\0';
putenv(buf);
}

@@ -126,7 +128,9 @@ static void fqdn_to_env(const char *name, const uint8_t *fqdn, size_t len)
buf_len += strlen(&buf[buf_len]);
buf[buf_len++] = ' ';
}
buf[buf_len - 1] = '\0';
if (buf[buf_len - 1] == ' ')
buf_len--;
buf[buf_len] = '\0';
putenv(buf);
}

@@ -201,7 +205,9 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
buf[buf_len++] = ' ';
}

buf[buf_len - 1] = '\0';
if (buf[buf_len - 1] == ' ')
buf_len--;
buf[buf_len] = '\0';
putenv(buf);
}

@@ -220,7 +226,9 @@ static void search_to_env(const char *name, const uint8_t *start, size_t len)
*c++ = ' ';
}

c[-1] = '\0';
if (c[-1] == ' ')
c--;
*c = '\0';
putenv(buf);
}

0 comments on commit 6326ab3

Please sign in to comment.
You can’t perform that action at this time.