Skip to content

Commit 18a389c

Browse files
committed
UTF-8 environment: be a little bit more defensive
It is unlikely that we have an empty environment, ever, but *if* we do, when `environ_size - 1` is passed to `bsearchenv()` it is misinterpreted as a real large integer. To make the code truly defensive, refuse to do anything at all if the size is negative (which should not happen, of course). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 32fa1e9 commit 18a389c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

compat/mingw.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ static int bsearchenv(char **env, const char *name, size_t size)
14141414
*/
14151415
static int do_putenv(char **env, const char *name, int size, int free_old)
14161416
{
1417-
int i = bsearchenv(env, name, size - 1);
1417+
int i = size <= 0 ? -1 : bsearchenv(env, name, size - 1);
14181418

14191419
/* optionally free removed / replaced entry */
14201420
if (i >= 0 && free_old)
@@ -1439,7 +1439,13 @@ static int do_putenv(char **env, const char *name, int size, int free_old)
14391439
char *mingw_getenv(const char *name)
14401440
{
14411441
char *value;
1442-
int pos = bsearchenv(environ, name, environ_size - 1);
1442+
int pos;
1443+
1444+
if (environ_size <= 0)
1445+
return NULL;
1446+
1447+
pos = bsearchenv(environ, name, environ_size - 1);
1448+
14431449
if (pos < 0)
14441450
return NULL;
14451451
value = strchr(environ[pos], '=');

0 commit comments

Comments
 (0)