From 3042d655e2c20dccf00fba6a64f72385330d2b7a Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Wed, 17 Feb 2016 15:50:01 -0500 Subject: [PATCH] MDEV-9577: sys_vars.ignore_db_dirs_basic fails under Valgrind Ensure that the command line argument is of sufficient length before moving past the leading long option marker "--". --- sql/wsrep_check_opts.cc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sql/wsrep_check_opts.cc b/sql/wsrep_check_opts.cc index 75894061d3f..188f0696bff 100644 --- a/sql/wsrep_check_opts.cc +++ b/sql/wsrep_check_opts.cc @@ -151,7 +151,20 @@ find_opts (argv_copy& a, struct opt* const opts) { for (int i = 0; i < a.argc_; ++i) { - char* ptr = a.argv_[i] + 2; // we're interested only in long options + char *ptr; + + /* + We're interested only in long options, ensure that the arg is of + sufficient length. + */ + if (strlen(a.argv_[i]) > 2) + { + ptr= a.argv_[i] + 2; + } + else + { + continue; + } struct opt* opt = opts; for (; 0 != opt->name; ++opt)