From: Benjamin Kramer Date: Wed, 16 Sep 2009 13:10:04 +0000 (+0000) Subject: PR4991: Properly remove trailing newline from __TIMESTAMP__. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37473829cb2308af5b268a2d58bf3d7fa2056610;p=clang PR4991: Properly remove trailing newline from __TIMESTAMP__. Replace strcpy with memcpy while at it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82043 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 47056fc380..7ddf215020 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -622,9 +622,9 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) { Result = "??? ??? ?? ??:??:?? ????\n"; } TmpBuffer[0] = '"'; - strcpy(TmpBuffer+1, Result); - unsigned Len = strlen(TmpBuffer); - TmpBuffer[Len] = '"'; // Replace the newline with a quote. + unsigned Len = strlen(Result); + memcpy(TmpBuffer+1, Result, Len-1); // Copy string without the newline. + TmpBuffer[Len] = '"'; Tok.setKind(tok::string_literal); CreateString(TmpBuffer, Len+1, Tok, Tok.getLocation()); } else if (II == Ident__COUNTER__) {