aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2015-11-04 01:29:00 -0200
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2015-11-04 01:29:00 -0200
commit13ce0cdba95a857410208282ea5d0bb13ee1baec (patch)
treeff53b56d31231f9f05fd3ff9f518f7f90f90bea0
parent37850db5081e26a26f05d062497811b864953778 (diff)
downloadblogc-13ce0cdba95a857410208282ea5d0bb13ee1baec.tar.gz
blogc-13ce0cdba95a857410208282ea5d0bb13ee1baec.tar.bz2
blogc-13ce0cdba95a857410208282ea5d0bb13ee1baec.zip
Revert "content-parser: fix memory leak in gcc"
This reverts commit 8c5ad9b304fd405380501f5acd1f7c809a1a2746.
-rw-r--r--src/content-parser.c2
-rw-r--r--tests/check_content_parser.c8
2 files changed, 4 insertions, 6 deletions
diff --git a/src/content-parser.c b/src/content-parser.c
index f451587..1529ace 100644
--- a/src/content-parser.c
+++ b/src/content-parser.c
@@ -1109,7 +1109,7 @@ param_end:
if (c == '\n' || c == '\r' || is_last) {
char *rv_d = blogc_directive_loader(directive_name,
directive_argument, directive_params);
- if (rv_d != NULL)
+ if (rv_d)
b_string_append(rv, rv_d);
free(rv_d);
state = CONTENT_START_LINE;
diff --git a/tests/check_content_parser.c b/tests/check_content_parser.c
index 8bd16ec..5d13564 100644
--- a/tests/check_content_parser.c
+++ b/tests/check_content_parser.c
@@ -1026,11 +1026,9 @@ __wrap_blogc_directive_loader(const char *name, const char *argument,
assert_string_equal(argument, arg);
assert_int_equal(b_trie_size(params), mock_type(unsigned int));
- for (unsigned int i = 0; i < b_trie_size(params); i++) {
- const char *key = mock_type(const char*);
- const char *value = mock_type(const char*);
- assert_string_equal(b_trie_lookup(params, key), value);
- }
+ for (unsigned int i = 0; i < b_trie_size(params); i++)
+ assert_string_equal(b_trie_lookup(params, mock_type(const char*)),
+ mock_type(const char*));
return b_strdup("CHUNDA\n");
}