maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages 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. 

llvm-svn: 180836
This commit is contained in:
Aaron Ballman 2013-05-01 02:53:14 +00:00
parent 64dd73e5e1
commit fd86e16dbd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/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
static unsigned int ArgLenWithQuotes(const char *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') {
if (*Str == '\"') {
@ -171,6 +172,12 @@ static unsigned int ArgLenWithQuotes(const char *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;
}