Make pestr[n]dup infallible

Fixes GH-9128

Author: iluuu1994

UPGRADING.INTERNALS

@@ -52,6 +52,8 @@ PHP 8.2 INTERNALS UPGRADE NOTES
   avoid duplicates when processing the same value multiple times, pass or add
   IS_CALLABLE_SUPPRESS_DEPRECATIONS to the check_flags parameter.
 * Registered zend_observer_fcall_init handlers are now also called for internal functions.
+* The pestrdup and pestrndup macros are now also infallible for persistent
+  strings, so checking for NULL is no longer necessary.
 
 ========================
 2. Build system changes

Zend/zend_alloc.c

@@ -3111,6 +3111,24 @@ ZEND_API void * __zend_realloc(void *p, size_t len)
 	zend_out_of_memory();
 }
 
+ZEND_API char * __zend_strdup(const char *s)
+{
+	char *tmp = strdup(s);
+	if (EXPECTED(tmp)) {
+		return tmp;
+	}
+	zend_out_of_memory();
+}
+
+ZEND_API char * ZEND_FASTCALL __zend_strndup(const char *s, size_t length)
+{
+	char *tmp = zend_strndup(s, length);
+	if (EXPECTED(tmp)) {
+		return tmp;
+	}
+	zend_out_of_memory();
+}
+
 #ifdef ZTS
 size_t zend_mm_globals_size(void)
 {

Zend/zend_alloc.h

@@ -63,6 +63,7 @@ typedef struct _zend_mm_debug_info {
 BEGIN_EXTERN_C()
 
 ZEND_API ZEND_ATTRIBUTE_MALLOC char*  ZEND_FASTCALL zend_strndup(const char *s, size_t length);
+ZEND_API ZEND_ATTRIBUTE_MALLOC char*  ZEND_FASTCALL __zend_strndup(const char *s, size_t length);
 
 ZEND_API ZEND_ATTRIBUTE_MALLOC void*  ZEND_FASTCALL _emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_ALLOC_SIZE(1);
 ZEND_API ZEND_ATTRIBUTE_MALLOC void*  ZEND_FASTCALL _safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
@@ -182,6 +183,7 @@ ZEND_API void ZEND_FASTCALL _efree_huge(void *, size_t size);
 ZEND_API ZEND_ATTRIBUTE_MALLOC void * __zend_malloc(size_t len) ZEND_ATTRIBUTE_ALLOC_SIZE(1);
 ZEND_API ZEND_ATTRIBUTE_MALLOC void * __zend_calloc(size_t nmemb, size_t len) ZEND_ATTRIBUTE_ALLOC_SIZE2(1,2);
 ZEND_API void * __zend_realloc(void *p, size_t len) ZEND_ATTRIBUTE_ALLOC_SIZE(2);
+ZEND_API ZEND_ATTRIBUTE_MALLOC char * __zend_strdup(const char *s);
 
 /* Selective persistent/non persistent allocation macros */
 #define pemalloc(size, persistent) ((persistent)?__zend_malloc(size):emalloc(size))
@@ -201,8 +203,8 @@ ZEND_API void * __zend_realloc(void *p, size_t len) ZEND_ATTRIBUTE_ALLOC_SIZE(2)
 #define safe_perealloc(ptr, nmemb, size, offset, persistent)	((persistent)?_safe_realloc((ptr), (nmemb), (size), (offset)):safe_erealloc((ptr), (nmemb), (size), (offset)))
 #define perealloc_recoverable(ptr, size, persistent) ((persistent)?realloc((ptr), (size)):erealloc_recoverable((ptr), (size)))
 #define perealloc2_recoverable(ptr, size, persistent) ((persistent)?realloc((ptr), (size)):erealloc2_recoverable((ptr), (size), (copy_size)))
-#define pestrdup(s, persistent) ((persistent)?strdup(s):estrdup(s))
-#define pestrndup(s, length, persistent) ((persistent)?zend_strndup((s),(length)):estrndup((s),(length)))
+#define pestrdup(s, persistent) ((persistent)?__zend_strdup(s):estrdup(s))
+#define pestrndup(s, length, persistent) ((persistent)?__zend_strndup((s),(length)):estrndup((s),(length)))
 
 #define pemalloc_rel(size, persistent) ((persistent)?__zend_malloc(size):emalloc_rel(size))
 #define pefree_rel(ptr, persistent)	((persistent)?free(ptr):efree_rel(ptr))

sapi/cli/php_cli_server.c

@@ -2490,21 +2490,13 @@ static zend_result php_cli_server_ctor(php_cli_server *server, const char *addr,
 	{
 		size_t document_root_len = strlen(document_root);
 		_document_root = pestrndup(document_root, document_root_len, 1);
-		if (!_document_root) {
-			retval = FAILURE;
-			goto out;
-		}
 		server->document_root = _document_root;
 		server->document_root_len = document_root_len;
 	}
 
 	if (router) {
 		size_t router_len = strlen(router);
 		_router = pestrndup(router, router_len, 1);
-		if (!_router) {
-			retval = FAILURE;
-			goto out;
-		}
 		server->router = _router;
 		server->router_len = router_len;
 	} else {