Backport CONC-805 to 3.3: Fix C23/glibc 2.43 const-correctness errors

Author: 9EOR9

libmariadb/mariadb_lib.c

@@ -787,63 +787,78 @@ static void options_add_initcommand(struct st_mysql_options *options,
   if (ma_insert_dynamic(options->init_command, (gptr)&insert))
     free(insert);
 }
+
 my_bool _mariadb_set_conf_option(MYSQL *mysql, const char *config_option, const char *config_value)
 {
-  if (config_option)
-  {
-    int i;
-    char *c;
-    
-    /* CONC-395: replace underscore "_" by dash "-" */
-    while ((c= strchr(config_option, '_')))
-      *c= '-';
-
-    for (i=0; mariadb_defaults[i].conf_key; i++)
+    if (config_option)
     {
-      if (!strcmp(mariadb_defaults[i].conf_key, config_option))
-      {
-        my_bool val_bool;
-        int     val_int;
-        size_t  val_sizet;
-        int rc;
-        void *option_val= NULL;
-        switch (mariadb_defaults[i].type) {
-        case MARIADB_OPTION_FUNC:
-          return mariadb_defaults[i].u.option_func(mysql, config_option, config_value, -1);
-        case MARIADB_OPTION_BOOL:
-          val_bool= 0;
-          if (config_value)
-            val_bool= atoi(config_value);
-          option_val= &val_bool;
-          break;
-        case MARIADB_OPTION_INT:
-          val_int= 0;
-          if (config_value)
-            val_int= atoi(config_value);
-          option_val= &val_int;
-          break;
-        case MARIADB_OPTION_SIZET:
-          val_sizet= 0;
-          if (config_value)
-            val_sizet= strtol(config_value, NULL, 10);
-          option_val= &val_sizet;
-          break;
-        case MARIADB_OPTION_STR:
-          if (config_value && !config_value[0])
-            option_val= NULL;
-          else
-            option_val= (void*)config_value;
-          break;
-        case MARIADB_OPTION_NONE:
-          break;
+        int i;
+        char *c;
+        char *mutable_option = strdup(config_option);
+
+        if (!mutable_option)
+            return 1;
+
+        /* CONC-395: replace underscore "_" by dash "-" */
+        while ((c = strchr(mutable_option, '_')))
+            *c = '-';
+
+        for (i = 0; mariadb_defaults[i].conf_key; i++)
+        {
+            if (!strcmp(mariadb_defaults[i].conf_key, mutable_option))
+            {
+                my_bool val_bool;
+                int val_int;
+                size_t val_sizet;
+                int rc;
+                void *option_val = NULL;
+
+                switch (mariadb_defaults[i].type) {
+                case MARIADB_OPTION_FUNC:
+                {
+                    int ret= mariadb_defaults[i].u.option_func(mysql, mutable_option, config_value, -1);
+                    free(mutable_option);
+                    return ret;
+                }
+                case MARIADB_OPTION_BOOL:
+                    val_bool = 0;
+                    if (config_value)
+                        val_bool = atoi(config_value);
+                    option_val = &val_bool;
+                    break;
+                case MARIADB_OPTION_INT:
+                    val_int = 0;
+                    if (config_value)
+                        val_int = atoi(config_value);
+                    option_val = &val_int;
+                    break;
+                case MARIADB_OPTION_SIZET:
+                    val_sizet = 0;
+                    if (config_value)
+                        val_sizet = strtol(config_value, NULL, 10);
+                    option_val = &val_sizet;
+                    break;
+                case MARIADB_OPTION_STR:
+                    if (config_value && !config_value[0])
+                        option_val = NULL;
+                    else
+                        option_val = (void*)config_value;
+                    break;
+                case MARIADB_OPTION_NONE:
+                    break;
+                }
+
+                rc = mysql_optionsv(mysql, mariadb_defaults[i].u.option, option_val);
+                free(mutable_option);
+                return test(rc);
+            }
         }
-        rc= mysql_optionsv(mysql, mariadb_defaults[i].u.option, option_val);
-        return(test(rc));
-      }
+
+        free(mutable_option);
     }
-  }
-  /* unknown key */
-  return 1;
+
+    /* unknown key */
+    return 1;
 }
 
 /**