Fix DXBC magic parsing

This gets identify_magic working correctly for DXContainer files

diff --git a/llvm/lib/BinaryFormat/Magic.cpp b/llvm/lib/BinaryFormat/Magic.cpp
index d48adb1..99d3f69 100644 (file)
--- a/llvm/lib/BinaryFormat/Magic.cpp
+++ b/llvm/lib/BinaryFormat/Magic.cpp
@@ -227,7 +227,7 @@ file_magic llvm::identify_magic(StringRef Magic) {
     break;
   
   case 'D': // DirectX container file - DXBC
-    if (startswith(Magic, "DXBC") && Magic.size() == 4)
+    if (startswith(Magic, "DXBC"))
       return file_magic::dxcontainer_object;
     break;
 

diff --git a/llvm/unittests/Object/DXContainerTest.cpp b/llvm/unittests/Object/DXContainerTest.cpp
index 95bafe8..1c8ef4f 100644 (file)
--- a/llvm/unittests/Object/DXContainerTest.cpp
+++ b/llvm/unittests/Object/DXContainerTest.cpp
@@ -22,8 +22,14 @@ template <std::size_t X> MemoryBufferRef getMemoryBuffer(uint8_t Data[X]) {
 }
 
 TEST(DXCFile, IdentifyMagic) {
-  StringRef Buffer("DXBC");
-  EXPECT_EQ(identify_magic(Buffer), file_magic::dxcontainer_object);
+  {
+    StringRef Buffer("DXBC");
+    EXPECT_EQ(identify_magic(Buffer), file_magic::dxcontainer_object);
+  }
+  {
+    StringRef Buffer("DXBCBlahBlahBlah");
+    EXPECT_EQ(identify_magic(Buffer), file_magic::dxcontainer_object);
+  }
 }
 
 TEST(DXCFile, ParseHeaderErrors) {