From 86df596c4121633114fca22585583f7b585b87aa Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Wed, 16 Oct 2013 03:29:49 +0000 Subject: [PATCH] Fix a bug in Windows resource file detection. The magic bytes should not include the trailing NUL byte. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192769 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Path.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp index 390614b9a5b..7fc9ab89672 100644 --- a/lib/Support/Path.cpp +++ b/lib/Support/Path.cpp @@ -849,7 +849,7 @@ error_code has_magic(const Twine &path, const Twine &magic, bool &result) { switch ((unsigned char)Magic[0]) { case 0x00: { // Windows resource file - const char Expected[] = "\0\0\0\0\x20\0\0\0\xff"; + const char Expected[] = { 0, 0, 0, 0, '\x20', 0, 0, 0, '\xff' }; if (Magic.size() >= sizeof(Expected) && memcmp(Magic.data(), Expected, sizeof(Expected)) == 0) return file_magic::windows_resource;