summaryrefslogtreecommitdiff
path: root/src/configparser.y
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2016-03-15 18:41:59 +0000
committerStefan Bühler <stbuehler@web.de>2016-03-15 18:41:59 +0000
commite7a39cde3626d4649400f49ce0e66bbb77fce70d (patch)
tree46cad53d0081e950286a10369c6eedcff0f901dc /src/configparser.y
parent224bf545c1da26f1996e8d6d3a0d2bc33c6f3d95 (diff)
downloadlighttpd-git-e7a39cde3626d4649400f49ce0e66bbb77fce70d.tar.gz
[core] fix memory leak in configparser_merge_data
Release op1 memory on failure; fixes some theoretical memory leaks (a failure results in early exit anyway). From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3101 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'src/configparser.y')
-rw-r--r--src/configparser.y1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/configparser.y b/src/configparser.y
index 10241456..24efb6b0 100644
--- a/src/configparser.y
+++ b/src/configparser.y
@@ -71,6 +71,7 @@ data_unset *configparser_merge_data(data_unset *op1, const data_unset *op2) {
return (data_unset *)ds;
} else {
fprintf(stderr, "data type mismatch, cannot merge\n");
+ op1->free(op1);
return NULL;
}
}