From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Mon, 8 Dec 2008 12:41:46 +0000 (+0000)
Subject: Repair L"a" "b" concatenation.
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=555a3f9967c8b15c59b1d671c72ea361f25d03d3;p=cparser

Repair L"a" "b" concatenation.

[r24395]
---

diff --git a/lexer.c b/lexer.c
index d2180c0..0f01d44 100644
--- a/lexer.c
+++ b/lexer.c
@@ -937,9 +937,10 @@ wide_string_t concat_wide_string_string(const wide_string_t *const s1, const str
 
 	wchar_rep_t *const concat = obstack_alloc(&symbol_obstack, (len1 + len2 + 1) * sizeof(*concat));
 	memcpy(concat, s1->begin, len1 * sizeof(*concat));
-	const char *const src = s2->begin;
+	const char  *const src = s2->begin;
+	wchar_rep_t *const dst = concat + len1;
 	for (size_t i = 0; i != len2 + 1; ++i) {
-		concat[i] = src[i];
+		dst[i] = src[i];
 	}
 	if (warning.traditional) {
 		warningf(&lexer_token.source_position,