diff options
author | George Rimar <grimar@accesssoftek.com> | 2019-10-21 10:38:03 +0000 |
---|---|---|
committer | George Rimar <grimar@accesssoftek.com> | 2019-10-21 10:38:03 +0000 |
commit | 4ec0b084389619442638d7d3563793f21d787501 (patch) | |
tree | 5d76c986605c5bca6298106e4d14d48677caeb74 | |
parent | d6e6aa8a42a96c09a78f0e02ecf50f12deda8024 (diff) | |
download | bcm5719-llvm-4ec0b084389619442638d7d3563793f21d787501.tar.gz bcm5719-llvm-4ec0b084389619442638d7d3563793f21d787501.zip |
[obj2yaml] - Stop triggering UB when dumping corrupted strings.
We have a following code to find quote type:
if (isspace(S.front()) || isspace(S.back()))
...
Problem is that:
"int isspace( int ch ): The behavior is undefined if the value of
ch is not representable as unsigned char and is not equal to EOF."
(https://en.cppreference.com/w/cpp/string/byte/isspace)
This patch shows how this UB can be triggered and fixes an issue.
Differential revision: https://reviews.llvm.org/D69160
llvm-svn: 375404
-rw-r--r-- | llvm/include/llvm/Support/YAMLTraits.h | 3 | ||||
-rw-r--r-- | llvm/test/tools/obj2yaml/invalid-section-name.yaml | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/llvm/include/llvm/Support/YAMLTraits.h b/llvm/include/llvm/Support/YAMLTraits.h index 656020ec49d..a3bfa7dc467 100644 --- a/llvm/include/llvm/Support/YAMLTraits.h +++ b/llvm/include/llvm/Support/YAMLTraits.h @@ -649,7 +649,8 @@ inline bool isBool(StringRef S) { inline QuotingType needsQuotes(StringRef S) { if (S.empty()) return QuotingType::Single; - if (isspace(S.front()) || isspace(S.back())) + if (isspace(static_cast<unsigned char>(S.front())) || + isspace(static_cast<unsigned char>(S.back()))) return QuotingType::Single; if (isNull(S)) return QuotingType::Single; diff --git a/llvm/test/tools/obj2yaml/invalid-section-name.yaml b/llvm/test/tools/obj2yaml/invalid-section-name.yaml new file mode 100644 index 00000000000..ed972ef75ca --- /dev/null +++ b/llvm/test/tools/obj2yaml/invalid-section-name.yaml @@ -0,0 +1,31 @@ +## Check we do not crash/assert when dumping a broken section name. +## Here we replace "foo" name with a sequence of characters that +## do are not representable as unsigned char. +## We used to have an assert for this case before. + +# RUN: yaml2obj %s -o %t +# RUN: obj2yaml %t | FileCheck %s + +# CHECK: --- !ELF +# CHECK-NEXT: FileHeader: +# CHECK-NEXT: Class: ELFCLASS64 +# CHECK-NEXT: Data: ELFDATA2LSB +# CHECK-NEXT: Type: ET_REL +# CHECK-NEXT: Machine: EM_X86_64 +# CHECK-NEXT: Sections: +# CHECK-NEXT: - Name: "{{.*}}" +# CHECK-NEXT: Type: SHT_PROGBITS +# CHECK-NEXT: ... + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Sections: + - Name: foo + Type: SHT_PROGBITS + - Name: .shstrtab + Type: SHT_STRTAB + Content: "00FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE00" |