Message ID | 1455717855-2344-2-git-send-email-ian.campbell@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Ian Campbell writes ("[PATCH 2/3] xl: use xrealloc in domain create"): > Using bare realloc risks leaking the old pointer if the realloc fails. > > Since xrealloc exits on such failures, drop the error handling. > > Noticed while fixing, but not related to, CID 1055898. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> And queued for push. Ian.
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e819ee6..7ba40c0 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2799,12 +2799,8 @@ static uint32_t create_domain(struct domain_create *dom_info) return ERROR_FAIL; } /* allocate space for the extra config plus two EOLs plus \0 */ - config_data = realloc(config_data, config_len + config_data = xrealloc(config_data, config_len + strlen(extra_config) + 2 + 1); - if (!config_data) { - fprintf(stderr, "Failed to realloc config_data\n"); - return ERROR_FAIL; - } config_len += sprintf(config_data + config_len, "\n%s\n", extra_config); }
Using bare realloc risks leaking the old pointer if the realloc fails. Since xrealloc exits on such failures, drop the error handling. Noticed while fixing, but not related to, CID 1055898. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- tools/libxl/xl_cmdimpl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)