Message ID | 1452029923-8685-1-git-send-email-u9012063@gmail.com |
---|---|
State | Accepted |
Headers | show |
On Tue, Jan 05, 2016 at 01:38:41PM -0800, William Tu wrote: > Reported by 348: ovs-ofctl parse-flows (skb_priority) > Reason: return without freeing memory > > Signed-off-by: William Tu <u9012063@gmail.com> > Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com> > Co-authored-by: Daniele Di Proietto <diproiettod@vmware.com> Thanks, applied to master, branch-2.5, branch-2.4, branch-2.3.
diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index c346f10..aa0cad7 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -1039,6 +1039,7 @@ parse_ofp_flow_mod_file(const char *file_name, int command, error = parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command, &usable); if (error) { + char *err_msg; size_t i; for (i = 0; i < *n_fms; i++) { @@ -1053,7 +1054,9 @@ parse_ofp_flow_mod_file(const char *file_name, int command, fclose(stream); } - return xasprintf("%s:%d: %s", file_name, line_number, error); + err_msg = xasprintf("%s:%d: %s", file_name, line_number, error); + free(error); + return err_msg; } *usable_protocols &= usable; /* Each line can narrow the set. */ *n_fms += 1;