Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit deb8b8190ed2 · 2020-11-24T13:10:35.000+01:00
* PHP-7.4:
  Fix #80366: Return Value of zend_fstat() not Checked
diff --git a/NEWS b/NEWS
@@ -12,6 +12,9 @@ PHP                                                                        NEWS
   . Fixed bug #80404 (Incorrect range inference result when division results
     in float). (Nikita)
 
+- Standard:
+  . Fixed bug #80366 (Return Value of zend_fstat() not Checked). (sagpant, cmb)
+
 - Tidy:
   . Fixed bug #77594 (ob_tidyhandler is never reset). (cmb)
 
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
@@ -203,7 +203,9 @@ PHP_FUNCTION(iptcembed)
 	}
 
 	if (spool < 2) {
-		zend_fstat(fileno(fp), &sb);
+		if (zend_fstat(fileno(fp), &sb) != 0) {
+			RETURN_FALSE;
+		}
 
 		spoolbuf = zend_string_safe_alloc(1, iptcdata_len + sizeof(psheader) + 1024 + 1, sb.st_size, 0);
 		poi = (unsigned char*)ZSTR_VAL(spoolbuf);

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,9 @@ PHP_FUNCTION(iptcembed)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`if (spool < 2) {`
`206`		`- zend_fstat(fileno(fp), &sb);`
	`206`	`+ if (zend_fstat(fileno(fp), &sb) != 0) {`
	`207`	`+ RETURN_FALSE;`
	`208`	`+ }`
`207`	`209`
`208`	`210`	`spoolbuf = zend_string_safe_alloc(1, iptcdata_len + sizeof(psheader) + 1024 + 1, sb.st_size, 0);`
`209`	`211`	`poi = (unsigned char*)ZSTR_VAL(spoolbuf);`