Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
This commit is contained in:
Xinchen Hui 2012-07-18 19:06:58 +08:00
commit f13288de96

View file

@ -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) {