Skip to content

Commit f13288d

Browse files
committed
Merge branch 'PHP-5.4'
* PHP-5.4: Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
2 parents cea3f0f + 25be12a commit f13288d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ext/mysqlnd/mysqlnd_debug.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,11 @@ enum mysqlnd_debug_parser_state
516516
static void
517517
MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const mode)
518518
{
519-
unsigned int mode_len = strlen(mode), i;
519+
unsigned int mode_len, i;
520520
enum mysqlnd_debug_parser_state state = PARSER_WAIT_MODIFIER;
521521

522+
mode_len = mode? strlen(mode) : 0;
523+
522524
self->flags = 0;
523525
self->nest_level_limit = 0;
524526
if (self->file_name && self->file_name != mysqlnd_debug_default_trace_file) {

0 commit comments

Comments
 (0)