diff options
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 12 | ||||
| -rw-r--r-- | test/Assembler/short-hexpair.ll | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index 614a283241e..d2ed616e782 100644 --- a/lib/AsmParser/LLLexer.cpp +++ b/lib/AsmParser/LLLexer.cpp @@ -78,13 +78,15 @@ uint64_t LLLexer::HexIntToVal(const char *Buffer, const char *End) { void LLLexer::HexToIntPair(const char *Buffer, const char *End, uint64_t Pair[2]) { Pair[0] = 0; - for (int i=0; i<16; i++, Buffer++) { - assert(Buffer != End); - Pair[0] *= 16; - Pair[0] += hexDigitValue(*Buffer); + if (End - Buffer >= 16) { + for (int i = 0; i < 16; i++, Buffer++) { + assert(Buffer != End); + Pair[0] *= 16; + Pair[0] += hexDigitValue(*Buffer); + } } Pair[1] = 0; - for (int i=0; i<16 && Buffer != End; i++, Buffer++) { + for (int i = 0; i < 16 && Buffer != End; i++, Buffer++) { Pair[1] *= 16; Pair[1] += hexDigitValue(*Buffer); } diff --git a/test/Assembler/short-hexpair.ll b/test/Assembler/short-hexpair.ll new file mode 100644 index 00000000000..067ea30b0dd --- /dev/null +++ b/test/Assembler/short-hexpair.ll @@ -0,0 +1,4 @@ +; RUN: llvm-as < %s | llvm-dis | FileCheck %s + +@x = global fp128 0xL01 +; CHECK: @x = global fp128 0xL00000000000000000000000000000001 |