1 files changed, 7 insertions, 4 deletions
diff --git a/m_config.c b/m_config.c
index 024f7d713f..538ebc32a3 100644
--- a/m_config.c
+++ b/m_config.c
@@ -229,10 +229,13 @@ m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefi
         m_option_save(config, arg, sl->data);
         // Hack to avoid too much trouble with dynamically allocated data :
         // We always use a dynamic version
-        if ((arg->type->flags & M_OPT_TYPE_DYNAMIC) && arg->p
-            && (*(void**)arg->p)) {
-            *(void**)arg->p = NULL;
-            m_option_set(config, arg, sl->data);
+        if ((arg->type->flags & M_OPT_TYPE_DYNAMIC)) {
+            char **hackptr = arg->new ? (char*)config->optstruct + arg->offset
+                                      : arg->p;
+            if (hackptr && *hackptr) {
+                *hackptr = NULL;
+                m_option_set(config, arg, sl->data);
+            }
         }
         sl->lvl = 0;
         sl->prev = NULL;