Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)

diff --git a/NEWS b/NEWS
index 9da5717dd32abae8b801215040ad06122b79f358..280eb1ff15d3048d769241e0ccd816977a453734 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ PHP                                                                        NEWS
   . Fixed bug #62564 (Extending MessageFormatter and adding property causes 
     crash). (Felipe)
 
+- MySQLnd:
+  . Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode). (Laruence)
+
 - Reflection:
   . Implemented FR #61602 (Allow access to name of constant used as default 
     value). (reeze.xia@gmail.com)

diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index 5c77b42459b65700090854c67955b8f6b4308ab2..044a7d6807d3b0da299cb5a1277ca025abdecff6 100644 (file)
--- 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) {