pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add input validation to SDL_getenv/SDL_setenv; update Stdlib testsuite; add Hints testsuite

Browse source
This commit is contained in:
Andreas Schiffler 2014-03-19 21:39:55 -07:00
parent 4dd6e749db
commit 721340f510
9 changed files with 351 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/stdlib/SDL_getenv.c
View file

@ -33,16 +33,27 @@ static size_t SDL_envmemlen = 0;
#endif
/* Put a variable into the environment */
/* Note: Name may not contain a '=' character. (Reference: http://www.unix.com/man-page/Linux/3/setenv/) */
#if defined(HAVE_SETENV)
int
SDL_setenv(const char *name, const char *value, int overwrite)
{
/* Input validation */
if (!name || SDL_strlen(name) == 0 || SDL_strchr(name, '=') != NULL || !value) {
return (-1);
}
return setenv(name, value, overwrite);
}
#elif defined(__WIN32__)
int
SDL_setenv(const char *name, const char *value, int overwrite)
{
/* Input validation */
if (!name || SDL_strlen(name) == 0 || SDL_strchr(name, '=') != NULL || !value) {
return (-1);
}
if (!overwrite) {
char ch = 0;
const size_t len = GetEnvironmentVariableA(name, &ch, sizeof (ch));
@ -63,6 +74,11 @@ SDL_setenv(const char *name, const char *value, int overwrite)
size_t len;
char *new_variable;
/* Input validation */
if (!name || SDL_strlen(name) == 0 || SDL_strchr(name, '=') != NULL || !value) {
return (-1);
}
if (getenv(name) != NULL) {
if (overwrite) {
unsetenv(name);
@ -91,8 +107,8 @@ SDL_setenv(const char *name, const char *value, int overwrite)
char **new_env;
char *new_variable;
/* A little error checking */
if (!name || !value) {
/* Input validation */
if (!name || SDL_strlen(name) == 0 || SDL_strchr(name, '=') != NULL || !value) {
return (-1);
}
@ -152,6 +168,11 @@ SDL_setenv(const char *name, const char *value, int overwrite)
char *
SDL_getenv(const char *name)
{
/* Input validation */
if (!name || SDL_strlen(name)==0) {
return NULL;
}
return getenv(name);
}
#elif defined(__WIN32__)
@ -160,6 +181,11 @@ SDL_getenv(const char *name)
{
size_t bufferlen;
/* Input validation */
if (!name || SDL_strlen(name)==0) {
return NULL;
}
bufferlen =
GetEnvironmentVariableA(name, SDL_envmem, (DWORD) SDL_envmemlen);
if (bufferlen == 0) {
@ -183,6 +209,11 @@ SDL_getenv(const char *name)
int len, i;
char *value;
/* Input validation */
if (!name || SDL_strlen(name)==0) {
return NULL;
}
value = (char *) 0;
if (SDL_env) {
len = SDL_strlen(name);