summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex McHale <alexmchale@gmail.com>2010-04-13 11:48:33 -0500
committerAlex McHale <alexmchale@gmail.com>2010-04-13 11:48:33 -0500
commit9a22de8270fbb594cbdd23fe06a9e193ee01f17a (patch)
tree03abec69a177050ccdea6ec7c82fb20e46dd0f0e
parentb60bace9f945d30029596a6bd91412d2e1053c69 (diff)
downloadredis-9a22de8270fbb594cbdd23fe06a9e193ee01f17a.tar.gz
Fixed a tiny memory leak when loading the configuration file.
-rw-r--r--redis.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/redis.c b/redis.c
index e78f75aa6..bb54cce02 100644
--- a/redis.c
+++ b/redis.c
@@ -1693,15 +1693,12 @@ static void loadServerConfig(char *filename) {
char buf[REDIS_CONFIGLINE_MAX+1], *err = NULL;
int linenum = 0;
sds line = NULL;
- char *errormsg = "Fatal error, can't open config file '%s'";
- char *errorbuf = zmalloc(sizeof(char)*(strlen(errormsg)+strlen(filename)));
- sprintf(errorbuf, errormsg, filename);
if (filename[0] == '-' && filename[1] == '\0')
fp = stdin;
else {
if ((fp = fopen(filename,"r")) == NULL) {
- redisLog(REDIS_WARNING, errorbuf);
+ redisLog(REDIS_WARNING, "Fatal error, can't open config file '%s'", filename);
exit(1);
}
}