com php-src: Defensive check: ext/mysqlnd/mysqlnd.c

From: Date: Tue, 20 May 2014 13:41:14 +0000
Subject: com php-src: Defensive check: ext/mysqlnd/mysqlnd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78481@lists.php.net to get a copy of this message
Commit: 2312af04a7ca7a43166a7a1be20067e632ff917a Author: Andrey Hristov <andrey@php.net> Tue, 20 May 2014 16:41:14 +0300 Parents: 759f1009ad1d554c59fb9a6ef2407342c53b00b3 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2312af04a7ca7a43166a7a1be20067e632ff917a Log: Defensive check Changed paths: M ext/mysqlnd/mysqlnd.c Diff: diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index b6d3622..0289cd3 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2669,24 +2669,24 @@ static void MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * str, const unsigned int mode TSRMLS_DC) { if (mode & TRANS_COR_AND_CHAIN && !(mode & TRANS_COR_AND_NO_CHAIN)) { - if (str->s->len) { + if (str->s && str->s->len) { smart_str_appendl(str, " ", sizeof(" ") - 1); } smart_str_appendl(str, "AND CHAIN", sizeof("AND CHAIN") - 1); } else if (mode & TRANS_COR_AND_NO_CHAIN && !(mode & TRANS_COR_AND_CHAIN)) { - if (str->s->len) { + if (str->s && str->s->len) { smart_str_appendl(str, " ", sizeof(" ") - 1); } smart_str_appendl(str, "AND NO CHAIN", sizeof("AND NO CHAIN") - 1); } if (mode & TRANS_COR_RELEASE && !(mode & TRANS_COR_NO_RELEASE)) { - if (str->s->len) { + if (str->s && str->s->len) { smart_str_appendl(str, " ", sizeof(" ") - 1); } smart_str_appendl(str, "RELEASE", sizeof("RELEASE") - 1); } else if (mode & TRANS_COR_NO_RELEASE && !(mode & TRANS_COR_RELEASE)) { - if (str->s->len) { + if (str->s && str->s->len) { smart_str_appendl(str, " ", sizeof(" ") - 1); } smart_str_appendl(str, "NO RELEASE", sizeof("NO RELEASE") - 1);

« previous php.cvs (#78481) next »