Skip to content

Commit 2bc1588

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 fcb889d commit 2bc1588

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
@@ -1365,7 +1365,7 @@ static int bsearchenv(char **env, const char *name, size_t size)
13651365
*/
13661366
static int do_putenv(char **env, const char *name, int size, int free_old)
13671367
{
1368-
int i = bsearchenv(env, name, size - 1);
1368+
int i = size <= 0 ? -1 : bsearchenv(env, name, size - 1);
13691369

13701370
/* optionally free removed / replaced entry */
13711371
if (i >= 0 && free_old)
@@ -1390,7 +1390,13 @@ static int do_putenv(char **env, const char *name, int size, int free_old)
13901390
char *mingw_getenv(const char *name)
13911391
{
13921392
char *value;
1393-
int pos = bsearchenv(environ, name, environ_size - 1);
1393+
int pos;
1394+
1395+
if (environ_size <= 0)
1396+
return NULL;
1397+
1398+
pos = bsearchenv(environ, name, environ_size - 1);
1399+
13941400
if (pos < 0)
13951401
return NULL;
13961402
value = strchr(environ[pos], '=');

0 commit comments

Comments
 (0)