Skip to content

Commit f07ccbd

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 d596a2a commit f07ccbd

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
@@ -1301,7 +1301,7 @@ static int bsearchenv(char **env, const char *name, size_t size)
13011301
*/
13021302
static int do_putenv(char **env, const char *name, int size, int free_old)
13031303
{
1304-
int i = bsearchenv(env, name, size - 1);
1304+
int i = size <= 0 ? -1 : bsearchenv(env, name, size - 1);
13051305

13061306
/* optionally free removed / replaced entry */
13071307
if (i >= 0 && free_old)
@@ -1326,7 +1326,13 @@ static int do_putenv(char **env, const char *name, int size, int free_old)
13261326
char *mingw_getenv(const char *name)
13271327
{
13281328
char *value;
1329-
int pos = bsearchenv(environ, name, environ_size - 1);
1329+
int pos;
1330+
1331+
if (environ_size <= 0)
1332+
return NULL;
1333+
1334+
pos = bsearchenv(environ, name, environ_size - 1);
1335+
13301336
if (pos < 0)
13311337
return NULL;
13321338
value = strchr(environ[pos], '=');

0 commit comments

Comments
 (0)