From: antirez Date: Fri, 15 Jan 2010 18:35:13 +0000 (-0500) Subject: fixed a minor memory leak in configuration file parsing X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/fefed5979816be8371ce106f9d98bdefc5f806da fixed a minor memory leak in configuration file parsing --- diff --git a/redis.c b/redis.c index 343dce15..417cd200 100644 --- a/redis.c +++ b/redis.c @@ -1633,6 +1633,7 @@ static void loadServerConfig(char *filename) { err = "argument must be 'yes' or 'no'"; goto loaderr; } } else if (!strcasecmp(argv[0],"vm-swap-file") && argc == 2) { + zfree(server.vm_swap_file); server.vm_swap_file = zstrdup(argv[1]); } else if (!strcasecmp(argv[0],"vm-max-memory") && argc == 2) { server.vm_max_memory = strtoll(argv[1], NULL, 10); diff --git a/test-redis.tcl b/test-redis.tcl index 0b230e58..c0a025af 100644 --- a/test-redis.tcl +++ b/test-redis.tcl @@ -317,9 +317,9 @@ proc main {server port} { set _ $err } {} - test {DBSIZE should be 10001 now} { + test {DBSIZE should be 10101 now} { $r dbsize - } {10001} + } {10101} test {INCR against non existing key} { set res {}