Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in portage-utils: main.c
Date: Thu, 31 Oct 2013 02:40:31
Message-Id: 20131031024024.5AD572004E@flycatcher.gentoo.org
1 vapier 13/10/31 02:40:24
2
3 Modified: main.c
4 Log:
5 fix bug related to var parsing w/out braces
6
7 Revision Changes Path
8 1.229 portage-utils/main.c
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.229&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.229&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.228&r2=1.229
13
14 Index: main.c
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
17 retrieving revision 1.228
18 retrieving revision 1.229
19 diff -u -r1.228 -r1.229
20 --- main.c 29 Sep 2013 22:42:36 -0000 1.228
21 +++ main.c 31 Oct 2013 02:40:23 -0000 1.229
22 @@ -1,7 +1,7 @@
23 /*
24 * Copyright 2005-2013 Gentoo Foundation
25 * Distributed under the terms of the GNU General Public License v2
26 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.228 2013/09/29 22:42:36 vapier Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.229 2013/10/31 02:40:23 vapier Exp $
28 *
29 * Copyright 2005-2008 Ned Ludd - <solar@g.o>
30 * Copyright 2005-2013 Mike Frysinger - <vapier@g.o>
31 @@ -752,7 +752,7 @@
32 }
33 *svar = byte;
34 slen = strlen(sval);
35 - post_len = strlen(svar + 1);
36 + post_len = strlen(svar + !!brace);
37 *var->value.s = xrealloc(*var->value.s, pre_len + MAX(var_len, slen) + post_len + 1);
38
39 /*