diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2011-07-05 11:13:37 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2011-07-05 11:13:37 +0000 |
| commit | e87c38b229fca708c58dfb9dbb1806c531402dc1 (patch) | |
| tree | bbdeaab34b5006730e0d438df92383e9c8d20cc4 /clang/lib/AST/Stmt.cpp | |
| parent | de1d62314ab402e4eb39eeaba1bd8037123e6957 (diff) | |
| download | bcm5719-llvm-e87c38b229fca708c58dfb9dbb1806c531402dc1.tar.gz bcm5719-llvm-e87c38b229fca708c58dfb9dbb1806c531402dc1.zip | |
Don't overread the buffer when an %x escape in inline asm ends prematurely.
Tested by valgrind & Sema/asm.c.
llvm-svn: 134404
Diffstat (limited to 'clang/lib/AST/Stmt.cpp')
| -rw-r--r-- | clang/lib/AST/Stmt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/AST/Stmt.cpp b/clang/lib/AST/Stmt.cpp index 39f23fba9ed..e293f324aba 100644 --- a/clang/lib/AST/Stmt.cpp +++ b/clang/lib/AST/Stmt.cpp @@ -366,6 +366,10 @@ unsigned AsmStmt::AnalyzeAsmString(llvm::SmallVectorImpl<AsmStringPiece>&Pieces, // Handle %x4 and %x[foo] by capturing x as the modifier character. char Modifier = '\0'; if (isalpha(EscapedChar)) { + if (CurPtr == StrEnd) { // Premature end. + DiagOffs = CurPtr-StrStart-1; + return diag::err_asm_invalid_escape; + } Modifier = EscapedChar; EscapedChar = *CurPtr++; } |
