6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-10 02:25:47 +00:00
Code Issues Projects Releases Wiki Activity

Fixes a buffer overrun where the allocated buffer wasn't large enough to accommodate the closing quote escape rules in some instances.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180836 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Aaron Ballman
2013-05-01 02:53:14 +00:00
parent 10cc563bfe
commit af35d86bbd
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Support/Windows/Program.inc
View File

@@ -155,7 +155,8 @@ static char *EscapePrecedingEscapes(char *Dst, const char *Start,
/// CreateProcess and returns length of quoted arg with escaped quotes /// CreateProcess and returns length of quoted arg with escaped quotes
static unsigned int ArgLenWithQuotes(const char *Str) { static unsigned int ArgLenWithQuotes(const char *Str) {
const char *Start = Str; const char *Start = Str;
unsigned int len = ArgNeedsQuotes(Str) ? 2 : 0; bool Quoted = ArgNeedsQuotes(Str);
unsigned int len = Quoted ? 2 : 0;
while (*Str != '\0') { while (*Str != '\0') {
if (*Str == '\"') { if (*Str == '\"') {
@@ -171,6 +172,12 @@ static unsigned int ArgLenWithQuotes(const char *Str) {
++Str; ++Str;
} }
if (Quoted) {
// Make sure the closing quote doesn't get escaped by a trailing backslash.
unsigned PrecedingEscapes = CountPrecedingBackslashes(Start, Str);
len += PrecedingEscapes + 1;
}
return len; return len;
} }