Commit f75ad03
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix crash in php_openssl_pkey_init_ec() when EVP_PKEY_CTX_new() fails
Fix memory leak in check_cert() when X509_STORE_CTX_init() fails
Fix NPD when i2d_PKCS12_bio is called on NULL bio3 files changed
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1443 | 1443 | | |
1444 | 1444 | | |
1445 | 1445 | | |
1446 | | - | |
| 1446 | + | |
1447 | 1447 | | |
1448 | 1448 | | |
1449 | 1449 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
748 | 748 | | |
749 | 749 | | |
750 | 750 | | |
| 751 | + | |
751 | 752 | | |
752 | 753 | | |
753 | 754 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
454 | 454 | | |
455 | 455 | | |
456 | 456 | | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
457 | 460 | | |
458 | 461 | | |
459 | 462 | | |
| |||
0 commit comments