Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix memory leaks and missing error propagation when php_openssl_csr_make() fails to set a version

Author: ndossche

NEWS

@@ -21,6 +21,7 @@ PHP                                                                        NEWS
 
 - OpenSSL:
   . Fix memory leak regression in openssl_pbkdf2(). (ndossche)
+  . Fix a bunch of memory leaks and crashes on edge cases. (ndossche)
 
 - DOM:
   . Fixed bug GH-21566 (Dom\XMLDocument::C14N() emits duplicate xmlns

ext/openssl/openssl_backend_common.c

@@ -1090,13 +1090,15 @@ zend_result php_openssl_csr_make(struct php_x509_request * req, X509_REQ * csr,
 				}
 			}
 		}
+
+		if (!X509_REQ_set_pubkey(csr, req->priv_key)) {
+			php_openssl_store_errors();
+		}
 	} else {
 		php_openssl_store_errors();
+		return FAILURE;
 	}
 
-	if (!X509_REQ_set_pubkey(csr, req->priv_key)) {
-		php_openssl_store_errors();
-	}
 	return SUCCESS;
 }