Add missing error check on PEM_write_bio_PKCS7()

nielsdos · nielsdos · commit 22c9e7e27ea4 · 2023-03-05T22:07:43.000+01:00
Closes GH-10752.
diff --git a/NEWS b/NEWS
@@ -12,6 +12,9 @@ PHP                                                                        NEWS
 - Opcache:
   . Fixed build for macOS to cater with pkg-config settings. (David Carlier)
 
+- OpenSSL:
+  . Add missing error checks on file writing functions. (nielsdos)
+
 - Phar:
   . Fixed bug GH-10766 (PharData archive created with Phar::Zip format does
     not keep files metadata (datetime)). (nielsdos)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -5406,7 +5406,11 @@ PHP_FUNCTION(openssl_pkcs7_verify)
 			}
 
 			if (p7bout) {
-				PEM_write_bio_PKCS7(p7bout, p7);
+				if (PEM_write_bio_PKCS7(p7bout, p7) == 0) {
+					php_error_docref(NULL, E_WARNING, "Failed to write PKCS7 to file");
+					php_openssl_store_errors();
+					RETVAL_FALSE;
+				}
 			}
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -5406,7 +5406,11 @@ PHP_FUNCTION(openssl_pkcs7_verify)`
`5406`	`5406`	`}`
`5407`	`5407`
`5408`	`5408`	`if (p7bout) {`
`5409`		`- PEM_write_bio_PKCS7(p7bout, p7);`
	`5409`	`+ if (PEM_write_bio_PKCS7(p7bout, p7) == 0) {`
	`5410`	`+ php_error_docref(NULL, E_WARNING, "Failed to write PKCS7 to file");`
	`5411`	`+ php_openssl_store_errors();`
	`5412`	`+ RETVAL_FALSE;`
	`5413`	`+ }`
`5410`	`5414`	`}`
`5411`	`5415`	`}`
`5412`	`5416`	`} else {`