Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 4f233e3ba2d1 · 2025-06-09T22:05:21.000+02:00
* PHP-8.3:
  Fix technically incorrect sizeof
diff --git a/main/network.c b/main/network.c
@@ -229,7 +229,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
 	for (n = 1; (sai = sai->ai_next) != NULL; n++)
 		;
 
-	*sal = safe_emalloc((n + 1), sizeof(*sal), 0);
+	*sal = safe_emalloc((n + 1), sizeof(**sal), 0);
 	sai = res;
 	sap = *sal;
 
@@ -264,7 +264,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
 		in = *((struct in_addr *) host_info->h_addr);
 	}
 
-	*sal = safe_emalloc(2, sizeof(*sal), 0);
+	*sal = safe_emalloc(2, sizeof(**sal), 0);
 	sap = *sal;
 	*sap = emalloc(sizeof(struct sockaddr_in));
 	(*sap)->sa_family = AF_INET;

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka`
`229`	`229`	`for (n = 1; (sai = sai->ai_next) != NULL; n++)`
`230`	`230`	`;`
`231`	`231`
`232`		`- sal = safe_emalloc((n + 1), sizeof(sal), 0);`
	`232`	`+ sal = safe_emalloc((n + 1), sizeof(*sal), 0);`
`233`	`233`	`sai = res;`
`234`	`234`	`sap = *sal;`
`235`	`235`
`@@ -264,7 +264,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka`
`264`	`264`	`in = ((struct in_addr ) host_info->h_addr);`
`265`	`265`	`}`
`266`	`266`
`267`		`- sal = safe_emalloc(2, sizeof(sal), 0);`
	`267`	`+ sal = safe_emalloc(2, sizeof(*sal), 0);`
`268`	`268`	`sap = *sal;`
`269`	`269`	`*sap = emalloc(sizeof(struct sockaddr_in));`
`270`	`270`	`(*sap)->sa_family = AF_INET;`