unix,win: fix leak in uv_os_environ error path (libuv#4960)

ambujvashistha · web-flow · commit 9640bc651008 · 2025-12-06T22:04:49.000+01:00
diff --git a/src/unix/core.c b/src/unix/core.c
@@ -1533,7 +1533,7 @@ int uv_os_environ(uv_env_item_t** envitems, int* count) {
 
 fail:
   for (i = 0; i < cnt; i++) {
-    envitem = &(*envitems)[cnt];
+    envitem = &(*envitems)[i];
     uv__free(envitem->name);
   }
   uv__free(*envitems);
diff --git a/src/win/util.c b/src/win/util.c
@@ -1280,7 +1280,7 @@ int uv_os_environ(uv_env_item_t** envitems, int* count) {
   FreeEnvironmentStringsW(env);
 
   for (i = 0; i < cnt; i++) {
-    envitem = &(*envitems)[cnt];
+    envitem = &(*envitems)[i];
     uv__free(envitem->name);
   }
   uv__free(*envitems);

Original file line number	Diff line number	Diff line change
`@@ -1533,7 +1533,7 @@ int uv_os_environ(uv_env_item_t** envitems, int* count) {`
`1533`	`1533`
`1534`	`1534`	`fail:`
`1535`	`1535`	`for (i = 0; i < cnt; i++) {`
`1536`		`- envitem = &(*envitems)[cnt];`
	`1536`	`+ envitem = &(*envitems)[i];`
`1537`	`1537`	`uv__free(envitem->name);`
`1538`	`1538`	`}`
`1539`	`1539`	`uv__free(*envitems);`
Original file line number	Diff line number	Diff line change
`@@ -1280,7 +1280,7 @@ int uv_os_environ(uv_env_item_t** envitems, int* count) {`
`1280`	`1280`	`FreeEnvironmentStringsW(env);`
`1281`	`1281`
`1282`	`1282`	`for (i = 0; i < cnt; i++) {`
`1283`		`- envitem = &(*envitems)[cnt];`
	`1283`	`+ envitem = &(*envitems)[i];`
`1284`	`1284`	`uv__free(envitem->name);`
`1285`	`1285`	`}`
`1286`	`1286`	`uv__free(*envitems);`