Bug#22834781: CRASH IN CHECK_SYSLOG_TAG WHEN SETTING LOG_SYSLOG_TAG=NULL

jhauglid · jhauglid · commit 358cdb28e204 · 2016-03-04T14:56:34.000+01:00
Add check that the given tag string is non-null before checking
for illegal characters.
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -2055,7 +2055,7 @@ static bool fix_syslog(sys_var *self, THD *thd, enum_var_type type)
 
 static bool check_syslog_tag(sys_var *self, THD *THD, set_var *var)
 {
-  return ((var->value != NULL) &&
+  return ((var->save_result.string_value.str != NULL) &&
           (strchr(var->save_result.string_value.str, FN_LIBCHAR) != NULL));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2055,7 +2055,7 @@ static bool fix_syslog(sys_var self, THD thd, enum_var_type type)`
`2055`	`2055`
`2056`	`2056`	`static bool check_syslog_tag(sys_var self, THD THD, set_var *var)`
`2057`	`2057`	`{`
`2058`		`- return ((var->value != NULL) &&`
	`2058`	`+ return ((var->save_result.string_value.str != NULL) &&`
`2059`	`2059`	`(strchr(var->save_result.string_value.str, FN_LIBCHAR) != NULL));`
`2060`	`2060`	`}`
`2061`	`2061`