Gentoo Archives: gentoo-commits

From: "Michael Haubenwallner (haubi)" <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-alt r1659 - trunk/toolchain-prefix-wrapper/ld
Date: Mon, 27 Jul 2009 11:44:03
Message-Id: E1MVOcb-0001bD-OU@stork.gentoo.org
1 Author: haubi
2 Date: 2009-07-27 11:44:01 +0000 (Mon, 27 Jul 2009)
3 New Revision: 1659
4
5 Modified:
6 trunk/toolchain-prefix-wrapper/ld/hpuxplugin.c
7 Log:
8 fixed missing NULL-termination when adding '-B immediate' flags, results in 'Not enough space' errors
9
10 Modified: trunk/toolchain-prefix-wrapper/ld/hpuxplugin.c
11 ===================================================================
12 --- trunk/toolchain-prefix-wrapper/ld/hpuxplugin.c 2009-07-20 16:42:29 UTC (rev 1658)
13 +++ trunk/toolchain-prefix-wrapper/ld/hpuxplugin.c 2009-07-27 11:44:01 UTC (rev 1659)
14 @@ -325,12 +325,12 @@
15 * The last one of multiple incompatible "-B" arguments is used.
16 */
17 if (!isShared
18 - && (StringListAppendConcat(data->out->argList, STRnLEN("-B")) < 0
19 - || StringListAppendConcat(data->out->argList, STRnLEN("immediate")) < 0
20 - || StringListAppendConcat(data->out->argList, STRnLEN("-B")) < 0
21 - || StringListAppendConcat(data->out->argList, STRnLEN("nonfatal")) < 0
22 - || StringListAppendConcat(data->out->argList, STRnLEN("-B")) < 0
23 - || StringListAppendConcat(data->out->argList, STRnLEN("verbose")) < 0
24 + && (StringListAppendConcat(data->out->argList, STRnLEN("-B"), NULL) < 0
25 + || StringListAppendConcat(data->out->argList, STRnLEN("immediate"), NULL) < 0
26 + || StringListAppendConcat(data->out->argList, STRnLEN("-B"), NULL) < 0
27 + || StringListAppendConcat(data->out->argList, STRnLEN("nonfatal"), NULL) < 0
28 + || StringListAppendConcat(data->out->argList, STRnLEN("-B"), NULL) < 0
29 + || StringListAppendConcat(data->out->argList, STRnLEN("verbose"), NULL) < 0
30 )
31 ) break;