[mupen64plus-core] 179/310: Imported Upstream version 1.99.5+115+5afdc1c5e077

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit f477704e7a92d00d0ffc612f9442c38380cb8b7d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Sep 16 19:58:00 2012 +0200

    Imported Upstream version 1.99.5+115+5afdc1c5e077
---
 src/api/config.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/api/config.c b/src/api/config.c
index 8b89d4d..b259ca4 100644
--- a/src/api/config.c
+++ b/src/api/config.c
@@ -137,6 +137,8 @@ static config_var *config_var_create(const char *ParamName, const char *ParamHel
     if (var == NULL || ParamName == NULL)
         return NULL;
 
+    memset(var, 0, sizeof(config_var));
+
     var->name = strdup(ParamName);
     if (var->name == NULL)
     {
@@ -927,6 +929,16 @@ EXPORT m64p_error CALL ConfigSetParameter(m64p_handle ConfigSectionHandle, const
         append_var_to_section(section, var);
     }
 
+    /* cleanup old values */
+    switch (var->type)
+    {
+        case M64TYPE_STRING:
+            free(var->val.string);
+	    break;
+        default:
+            break;
+    }
+
     /* set this parameter's value */
     var->type = ParamType;
     switch(ParamType)
@@ -941,7 +953,6 @@ EXPORT m64p_error CALL ConfigSetParameter(m64p_handle ConfigSectionHandle, const
             var->val.integer = (*((int *) ParamValue) != 0);
             break;
         case M64TYPE_STRING:
-            free(var->val.string);
             var->val.string = strdup((char *)ParamValue);
             if (var->val.string == NULL)
                 return M64ERR_NO_MEMORY;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git