From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: Re: [PATCH] tools/xl: Fix trim() following c/s e316316 "xl: Rewrite trim()" Date: Thu, 16 Jul 2015 23:30:32 +0100 Message-ID: <20150716223032.GA1707@zion.uk.xensource.com> References: <1437074311-25446-1-git-send-email-andrew.cooper3@citrix.com> <20150716204749.GD29094@zion.uk.xensource.com> <55A827BE.2030908@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <55A827BE.2030908@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Andrew Cooper Cc: Ian Jackson , Wei Liu , Ian Campbell , Xen-devel List-Id: xen-devel@lists.xenproject.org On Thu, Jul 16, 2015 at 10:53:02PM +0100, Andrew Cooper wrote: > On 16/07/2015 21:47, Wei Liu wrote: > > On Thu, Jul 16, 2015 at 08:18:31PM +0100, Andrew Cooper wrote: > >> 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 > >> CC: Ian Campbell > >> CC: Ian Jackson > >> CC: Wei Liu > > Acked-by: Wei Liu > > > > One nit below. > > > >> --- > >> 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); > >> > > Can you move the declaration of result to the beginning of this > > function? > > I can, but why in particular? It is adjacent to the declaration of > len_nonnull. > C90 forbids this. Not sure how much we care about that and I'm probably bicksheding too much. Wei. > ~Andrew