BUG/MINOR: http-rules: Fix memory releases on error path during action parsing
When an error occurred during the parsing of an HTTP action, if some memory was
allocated, it should be released before exiting. Sometime a call to free() is
used on a sample expression instead of a call to release_sample_expr(). Other
time, it is just a string or a regex that should be released.
There is no real reason to backport this patch. Especially because this part was
highly modified recentely in 2.2-DEV.
diff --git a/src/http_act.c b/src/http_act.c
index b01bd40..9907425 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -268,6 +268,7 @@
px->conf.args.ctx = ARGC_HRQ;
if (!parse_logformat_string(args[cur_arg + 1], px, &rule->arg.http.fmt, LOG_OPT_HTTP,
(px->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR, err)) {
+ regex_free(rule->arg.http.re);
return ACT_RET_PRS_ERR;
}
@@ -543,13 +544,13 @@
memprintf(err,
"fetch method '%s' extracts information from '%s', none of which is available here",
args[cur_arg-1], sample_src_names(expr->fetch->use));
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
if (!args[cur_arg] || !*args[cur_arg]) {
memprintf(err, "expects 'len or 'id'");
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
@@ -558,6 +559,7 @@
if (!(px->cap & PR_CAP_FE)) {
memprintf(err, "proxy '%s' has no frontend capability", px->id);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
@@ -565,14 +567,14 @@
if (!args[cur_arg]) {
memprintf(err, "missing length value");
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
/* we copy the table name for now, it will be resolved later */
len = atoi(args[cur_arg]);
if (len <= 0) {
memprintf(err, "length must be > 0");
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
cur_arg++;
@@ -603,14 +605,14 @@
if (!args[cur_arg]) {
memprintf(err, "missing id value");
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
id = strtol(args[cur_arg], &error, 10);
if (*error != '\0') {
memprintf(err, "cannot parse id '%s'", args[cur_arg]);
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
cur_arg++;
@@ -627,7 +629,7 @@
else {
memprintf(err, "expects 'len' or 'id', found '%s'", args[cur_arg]);
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
@@ -727,19 +729,19 @@
memprintf(err,
"fetch method '%s' extracts information from '%s', none of which is available here",
args[cur_arg-1], sample_src_names(expr->fetch->use));
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
if (!args[cur_arg] || !*args[cur_arg]) {
memprintf(err, "expects 'id'");
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
if (strcmp(args[cur_arg], "id") != 0) {
memprintf(err, "expects 'id', found '%s'", args[cur_arg]);
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
@@ -747,14 +749,14 @@
if (!args[cur_arg]) {
memprintf(err, "missing id value");
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
id = strtol(args[cur_arg], &error, 10);
if (*error != '\0') {
memprintf(err, "cannot parse id '%s'", args[cur_arg]);
- free(expr);
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
cur_arg++;
@@ -1165,8 +1167,10 @@
}
cur_arg++;
- if (!parse_logformat_string(args[cur_arg], px, &rule->arg.http.fmt, LOG_OPT_HTTP, cap, err))
+ if (!parse_logformat_string(args[cur_arg], px, &rule->arg.http.fmt, LOG_OPT_HTTP, cap, err)) {
+ free(rule->arg.http.str.ptr);
return ACT_RET_PRS_ERR;
+ }
free(px->conf.lfs_file);
px->conf.lfs_file = strdup(px->conf.args.file);
@@ -1253,8 +1257,10 @@
LIST_INIT(&rule->arg.http.fmt);
cur_arg++;
- if (!(rule->arg.http.re = regex_comp(args[cur_arg], 1, 1, err)))
+ if (!(rule->arg.http.re = regex_comp(args[cur_arg], 1, 1, err))) {
+ free(rule->arg.http.str.ptr);
return ACT_RET_PRS_ERR;
+ }
if (rule->from == ACT_F_HTTP_REQ) {
px->conf.args.ctx = ARGC_HRQ;
@@ -1266,8 +1272,11 @@
}
cur_arg++;
- if (!parse_logformat_string(args[cur_arg], px, &rule->arg.http.fmt, LOG_OPT_HTTP, cap, err))
+ if (!parse_logformat_string(args[cur_arg], px, &rule->arg.http.fmt, LOG_OPT_HTTP, cap, err)) {
+ free(rule->arg.http.str.ptr);
+ regex_free(rule->arg.http.re);
return ACT_RET_PRS_ERR;
+ }
free(px->conf.lfs_file);
px->conf.lfs_file = strdup(px->conf.args.file);
@@ -1511,15 +1520,19 @@
/* key pattern */
LIST_INIT(&rule->arg.map.key);
- if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.key, LOG_OPT_HTTP, cap, err))
+ if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.key, LOG_OPT_HTTP, cap, err)) {
+ free(rule->arg.map.ref);
return ACT_RET_PRS_ERR;
+ }
if (rule->action == 1) {
/* value pattern for set-map only */
cur_arg++;
LIST_INIT(&rule->arg.map.value);
- if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.value, LOG_OPT_HTTP, cap, err))
+ if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.value, LOG_OPT_HTTP, cap, err)) {
+ free(rule->arg.map.ref);
return ACT_RET_PRS_ERR;
+ }
}
free(px->conf.lfs_file);
@@ -1636,6 +1649,7 @@
if (!(expr->fetch->val & where)) {
memprintf(err, "fetch method '%s' extracts information from '%s', none of which is available here",
args[cur_arg-1], sample_src_names(expr->fetch->use));
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}
@@ -1643,6 +1657,7 @@
cur_arg++;
if (!*args[cur_arg]) {
memprintf(err, "missing table name");
+ release_sample_expr(expr);
return ACT_RET_PRS_ERR;
}