Merge branch 'master' into next

2011-08-09 09:27:55 +02:00
parent e304902874 5dcbb341d1
commit 4253aa4ba2
6 changed files with 12 additions and 4 deletions
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@ -1150,6 +1150,7 @@ colorpixel:
        char *hex;
        if (asprintf(&hex, "#%s", $2) == -1)
            die("asprintf()");
+        free($2);
        $$ = get_colorpixel(hex);
        free(hex);
    }