diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-18 19:06:58 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-18 19:06:58 +0800 |
| commit | f13288de96b9cc064b976a384fad73a191891721 (patch) | |
| tree | f454fb621ae892069ccf505d2a8ee023ca87afb1 /ext/mysqlnd/mysqlnd_debug.c | |
| parent | cea3f0f3635179c052ba2d13d889a82b5a327ddb (diff) | |
| parent | 25be12a3bcd4a56a094d28b73cdc5cee68970bf3 (diff) | |
| download | php-git-f13288de96b9cc064b976a384fad73a191891721.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index cf355d2ffb..5ed2f83731 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -516,9 +516,11 @@ enum mysqlnd_debug_parser_state static void MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const mode) { - unsigned int mode_len = strlen(mode), i; + unsigned int mode_len, i; enum mysqlnd_debug_parser_state state = PARSER_WAIT_MODIFIER; + mode_len = mode? strlen(mode) : 0; + self->flags = 0; self->nest_level_limit = 0; if (self->file_name && self->file_name != mysqlnd_debug_default_trace_file) { |