cutils: str_parms: free the key if the value was replaced during create/add
Change-Id: I9f31da62f10f78ed11693a7c04e2be29b0790c93
Reported-by: Xin Qian <xqian@marvell.com>
Signed-off-by: Dima Zavin <dima@android.com>
diff --git a/libcutils/str_parms.c b/libcutils/str_parms.c
index 16138f6..364695c 100644
--- a/libcutils/str_parms.c
+++ b/libcutils/str_parms.c
@@ -128,8 +128,10 @@
/* if we replaced a value, free it */
old_val = hashmapPut(str_parms->map, key, value);
- if (old_val)
+ if (old_val) {
free(old_val);
+ free(key);
+ }
items++;
next_pair:
@@ -167,6 +169,7 @@
if (old_val) {
free(old_val);
+ free(tmp_key);
} else if (errno == ENOMEM) {
free(tmp_key);
free(tmp_val);
@@ -327,6 +330,7 @@
test_str_parms_str("foo=bar;baz=");
test_str_parms_str("foo=bar;baz=bat");
test_str_parms_str("foo=bar;baz=bat;");
+ test_str_parms_str("foo=bar;baz=bat;foo=bar");
return 0;
}