From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH] tools/xl: Fix trim() following c/s e316316 "xl: Rewrite trim()"
Date: Thu, 16 Jul 2015 20:18:31 +0100 [thread overview]
Message-ID: <1437074311-25446-1-git-send-email-andrew.cooper3@citrix.com> (raw)
c/s e316316 "xl: Rewrite trim()" uses the wrong indirection of
'output', causing memory corruption for all callers.
Introduce a new local variable, making the code more obviously
correct.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/xl_cmdimpl.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 37d4af6..0cc9f8b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -663,10 +663,12 @@ static void trim(char_predicate_t predicate, const char *input, char **output)
;
size_t len_nonnull = after - first;
+ char *result = xmalloc(len_nonnull + 1);
- *output = xmalloc(len_nonnull + 1);
- memcpy(output, first, len_nonnull);
- output[len_nonnull] = 0;
+ memcpy(result, first, len_nonnull);
+ result[len_nonnull] = 0;
+
+ *output = result;
}
static int split_string_into_pair(const char *str,
--
1.7.10.4
next reply other threads:[~2015-07-16 19:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 19:18 Andrew Cooper [this message]
2015-07-16 20:47 ` [PATCH] tools/xl: Fix trim() following c/s e316316 "xl: Rewrite trim()" Wei Liu
2015-07-16 21:53 ` Andrew Cooper
2015-07-16 22:30 ` Wei Liu
2015-07-17 10:04 ` Ian Jackson
2015-07-17 10:18 ` Ian Campbell
2015-07-17 10:04 ` Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437074311-25446-1-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).