com php-src: fix null pointer deref: ext/mysqlnd/mysqlnd.c

From: Date: Sun, 07 Sep 2014 18:26:01 +0000
Subject: com php-src: fix null pointer deref: ext/mysqlnd/mysqlnd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81451@lists.php.net to get a copy of this message
Commit: 5661a1ba0b9a3376ce551d0ab799cc3e4487c258 Author: Anatol Belski <ab@php.net> Sun, 7 Sep 2014 20:26:01 +0200 Parents: e254ba32d57b6a706e90af521995ec4ccfac4dd4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5661a1ba0b9a3376ce551d0ab799cc3e4487c258 Log: fix null pointer deref Changed paths: M ext/mysqlnd/mysqlnd.c Diff: diff --git a/ext/mysqlnd/mysqlnd..c b/ext/mysqlnd/mysqlnd.c index f6a3fff..74a8b72 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2804,12 +2804,12 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi smart_str_free(&tmp_str); break; } else if (mode & TRANS_START_READ_WRITE) { - if (tmp_str.s->len) { + if (tmp_str.s && tmp_str.s->len) { smart_str_appendl(&tmp_str, ", ", sizeof(", ") - 1); } smart_str_appendl(&tmp_str, "READ WRITE", sizeof("READ WRITE") - 1); } else if (mode & TRANS_START_READ_ONLY) { - if (tmp_str.s->len) { + if (tmp_str.s && tmp_str.s->len) { smart_str_appendl(&tmp_str, ", ", sizeof(", ") - 1); } smart_str_appendl(&tmp_str, "READ ONLY", sizeof("READ ONLY") - 1);

« previous php.cvs (#81451) next »