diff options
author | Owen Pan <owenpiano@gmail.com> | 2019-05-08 14:11:12 +0000 |
---|---|---|
committer | Owen Pan <owenpiano@gmail.com> | 2019-05-08 14:11:12 +0000 |
commit | 4ba5269f33ffd7252125d831418316e9f9e3b4a6 (patch) | |
tree | f1c0d41a749516d4f503697ddb210ac68239d290 /clang/tools/clang-format/ClangFormat.cpp | |
parent | d064c71802ac3aeec1450f0415df2ee6a36c282a (diff) | |
download | bcm5719-llvm-4ba5269f33ffd7252125d831418316e9f9e3b4a6.tar.gz bcm5719-llvm-4ba5269f33ffd7252125d831418316e9f9e3b4a6.zip |
[clang-format] Fix the crash when formatting unsupported encodings
Fixes PR33946
Differential Revision: https://reviews.llvm.org/D61559
llvm-svn: 360257
Diffstat (limited to 'clang/tools/clang-format/ClangFormat.cpp')
-rw-r--r-- | clang/tools/clang-format/ClangFormat.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp index 655a8d8e872..60a7feb7119 100644 --- a/clang/tools/clang-format/ClangFormat.cpp +++ b/clang/tools/clang-format/ClangFormat.cpp @@ -257,6 +257,36 @@ static bool format(StringRef FileName) { std::unique_ptr<llvm::MemoryBuffer> Code = std::move(CodeOrErr.get()); if (Code->getBufferSize() == 0) return false; // Empty files are formatted correctly. + + // Check to see if the buffer has a UTF Byte Order Mark (BOM). + // We only support UTF-8 with and without a BOM right now. See + // https://en.wikipedia.org/wiki/Byte_order_mark#Byte_order_marks_by_encoding + // for more information. + StringRef BufStr = Code->getBuffer(); + const char *InvalidBOM = llvm::StringSwitch<const char *>(BufStr) + .StartsWith(llvm::StringLiteral::withInnerNUL("\x00\x00\xFE\xFF"), + "UTF-32 (BE)") + .StartsWith(llvm::StringLiteral::withInnerNUL("\xFF\xFE\x00\x00"), + "UTF-32 (LE)") + .StartsWith("\xFE\xFF", "UTF-16 (BE)") + .StartsWith("\xFF\xFE", "UTF-16 (LE)") + .StartsWith("\x2B\x2F\x76", "UTF-7") + .StartsWith("\xF7\x64\x4C", "UTF-1") + .StartsWith("\xDD\x73\x66\x73", "UTF-EBCDIC") + .StartsWith("\x0E\xFE\xFF", "SCSU") + .StartsWith("\xFB\xEE\x28", "BOCU-1") + .StartsWith("\x84\x31\x95\x33", "GB-18030") + .Default(nullptr); + + if (InvalidBOM) { + errs() << "error: encoding with unsupported byte order mark \"" + << InvalidBOM << "\" detected"; + if (FileName != "-") + errs() << " in file '" << FileName << "'"; + errs() << ".\n"; + return true; + } + std::vector<tooling::Range> Ranges; if (fillRanges(Code.get(), Ranges)) return true; |