File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -27,6 +27,10 @@ PHP NEWS
27
27
return value check). (nielsdos, botovq)
28
28
. Fix error return check of EVP_CIPHER_CTX_ctrl(). (nielsdos)
29
29
30
+ - PDO Pgsql:
31
+ . Fixed dangling pointer access on _pdo_pgsql_trim_message helper.
32
+ (dixyes)
33
+
30
34
- SOAP:
31
35
. Fixed bug GH-18640 (heap-use-after-free ext/soap/php_encoding.c:299:32
32
36
in soap_check_zval_ref). (nielsdos)
Original file line number Diff line number Diff line change @@ -38,8 +38,14 @@ static bool pgsql_handle_in_transaction(pdo_dbh_t *dbh);
38
38
39
39
static char * _pdo_pgsql_trim_message (const char * message , int persistent )
40
40
{
41
- size_t i = strlen (message )- 1 ;
41
+ size_t i = strlen (message );
42
42
char * tmp ;
43
+ if (UNEXPECTED (i == 0 )) {
44
+ tmp = pemalloc (1 , persistent );
45
+ tmp [0 ] = '\0' ;
46
+ return tmp ;
47
+ }
48
+ -- i ;
43
49
44
50
if (i > 1 && (message [i - 1 ] == '\r' || message [i - 1 ] == '\n' ) && message [i ] == '.' ) {
45
51
-- i ;
You can’t perform that action at this time.
0 commit comments