Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 29a5adc6af12 · 2025-04-21T13:21:12.000+02:00
* PHP-8.3:
  Fix some leaks in php_scandir
diff --git a/NEWS b/NEWS
@@ -11,6 +11,7 @@ PHP                                                                        NEWS
     hooks). (ilutov)
   . Fixed bug GH-18304 (Changing the properties of a DateInterval through
     dynamic properties triggers a SegFault). (nielsdos)
+  . Fix some leaks in php_scandir. (nielsdos)
 
 - DBA:
   . FIxed bug GH-18247 dba_popen() memory leak on invalid path. (David Carlier)
diff --git a/main/php_scandir.c b/main/php_scandir.c
@@ -83,7 +83,7 @@ PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int (*se
 
 			newv = (struct dirent **) realloc (vector, vector_size * sizeof (struct dirent *));
 			if (!newv) {
-				return -1;
+				goto fail;
 			}
 			vector = newv;
 		}
@@ -113,6 +113,7 @@ PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int (*se
 		free(vector[nfiles]);
 	}
 	free(vector);
+	closedir(dirp);
 	return -1;
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ PHPAPI int php_scandir(const char dirname, struct dirent namelist[], int (se`
`83`	`83`
`84`	`84`	`newv = (struct dirent *) realloc (vector, vector_size sizeof (struct dirent *));`
`85`	`85`	`if (!newv) {`
`86`		`- return -1;`
	`86`	`+ goto fail;`
`87`	`87`	`}`
`88`	`88`	`vector = newv;`
`89`	`89`	`}`
`@@ -113,6 +113,7 @@ PHPAPI int php_scandir(const char dirname, struct dirent namelist[], int (se`
`113`	`113`	`free(vector[nfiles]);`
`114`	`114`	`}`
`115`	`115`	`free(vector);`
	`116`	`+ closedir(dirp);`
`116`	`117`	`return -1;`
`117`	`118`	`}`
`118`	`119`	`#endif`