diff options
| author | Anatol Belski <ab@php.net> | 2014-09-07 20:26:01 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-07 20:26:01 +0200 |
| commit | 5661a1ba0b9a3376ce551d0ab799cc3e4487c258 (patch) | |
| tree | b70cc619f7e69de3b56254b3fc9da9b999b92371 /ext/mysqlnd/mysqlnd.c | |
| parent | e254ba32d57b6a706e90af521995ec4ccfac4dd4 (diff) | |
| download | php-git-5661a1ba0b9a3376ce551d0ab799cc3e4487c258.tar.gz | |
fix null pointer deref
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index f6a3fffac8..74a8b721f2 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); |