Fix memory leak when calloc() fails in php_readline_completion_cb()

ndossche · ndossche · commit c9781111e1d2 · 2025-05-24T20:39:14.000+02:00
Closes phpGH-18637.
diff --git a/NEWS b/NEWS
@@ -8,6 +8,10 @@ PHP                                                                        NEWS
 - Phar:
   . Add missing filter cleanups on phar failure. (nielsdos)
 
+- Readline:
+  . Fix memory leak when calloc() fails in php_readline_completion_cb().
+    (nielsdos)
+
 05 Jun 2025, PHP 8.3.22
 
 - Core:
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
@@ -458,13 +458,14 @@ char **php_readline_completion_cb(const char *text, int start, int end)
 				/* libedit will read matches[2] */
 				matches = calloc(3, sizeof(char *));
 				if (!matches) {
-					return NULL;
+					goto out;
 				}
 				matches[0] = strdup("");
 			}
 		}
 	}
 
+out:
 	zval_ptr_dtor(&params[0]);
 	zval_ptr_dtor(&_readline_array);
 

Original file line number	Diff line number	Diff line change
`@@ -458,13 +458,14 @@ char *php_readline_completion_cb(const char text, int start, int end)`
`458`	`458`	`/* libedit will read matches[2] */`
`459`	`459`	`matches = calloc(3, sizeof(char *));`
`460`	`460`	`if (!matches) {`
`461`		`- return NULL;`
	`461`	`+ goto out;`
`462`	`462`	`}`
`463`	`463`	`matches[0] = strdup("");`
`464`	`464`	`}`
`465`	`465`	`}`
`466`	`466`	`}`
`467`	`467`
	`468`	`+out:`
`468`	`469`	`zval_ptr_dtor(&params[0]);`
`469`	`470`	`zval_ptr_dtor(&_readline_array);`
`470`	`471`