Commit fefed597 authored by antirez's avatar antirez
Browse files

fixed a minor memory leak in configuration file parsing

parent 2316bb3b
...@@ -1633,6 +1633,7 @@ static void loadServerConfig(char *filename) { ...@@ -1633,6 +1633,7 @@ static void loadServerConfig(char *filename) {
err = "argument must be 'yes' or 'no'"; goto loaderr; err = "argument must be 'yes' or 'no'"; goto loaderr;
} }
} else if (!strcasecmp(argv[0],"vm-swap-file") && argc == 2) { } else if (!strcasecmp(argv[0],"vm-swap-file") && argc == 2) {
zfree(server.vm_swap_file);
server.vm_swap_file = zstrdup(argv[1]); server.vm_swap_file = zstrdup(argv[1]);
} else if (!strcasecmp(argv[0],"vm-max-memory") && argc == 2) { } else if (!strcasecmp(argv[0],"vm-max-memory") && argc == 2) {
server.vm_max_memory = strtoll(argv[1], NULL, 10); server.vm_max_memory = strtoll(argv[1], NULL, 10);
......
...@@ -317,9 +317,9 @@ proc main {server port} { ...@@ -317,9 +317,9 @@ proc main {server port} {
set _ $err set _ $err
} {} } {}
test {DBSIZE should be 10001 now} { test {DBSIZE should be 10101 now} {
$r dbsize $r dbsize
} {10001} } {10101}
test {INCR against non existing key} { test {INCR against non existing key} {
set res {} set res {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment