adding fail test

Author: joaosaffran

llvm/include/llvm/Object/DXContainer.h

@@ -119,7 +119,6 @@ namespace DirectX {
 
 class RootSignature {
 private:
-  StringRef Data;
   uint32_t Version;
   uint32_t NumParameters;
   uint32_t RootParametersOffset;
@@ -128,9 +127,9 @@ class RootSignature {
   uint32_t Flags;
 
 public:
-  RootSignature(StringRef Data) : Data(Data) {}
+  RootSignature() {}
 
-  Error parse();
+  Error parse(StringRef Data);
   uint32_t getVersion() const { return Version; }
   uint32_t getNumParameters() const { return NumParameters; }
   uint32_t getRootParametersOffset() const { return RootParametersOffset; }

llvm/lib/Object/DXContainer.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Object/DXContainer.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Object/Error.h"
 #include "llvm/Support/Alignment.h"
@@ -96,8 +97,8 @@ Error DXContainer::parseHash(StringRef Part) {
 Error DXContainer::parseRootSignature(StringRef Part) {
   if (RootSignature)
     return parseFailed("More than one RTS0 part is present in the file");
-  RootSignature = DirectX::RootSignature(Part);
-  if (Error Err = RootSignature->parse())
+  RootSignature = DirectX::RootSignature();
+  if (Error Err = RootSignature->parse(Part))
     return Err;
   return Error::success();
 }
@@ -242,9 +243,14 @@ void DXContainer::PartIterator::updateIteratorImpl(const uint32_t Offset) {
   IteratorState.Offset = Offset;
 }
 
-Error DirectX::RootSignature::parse() {
+Error DirectX::RootSignature::parse(StringRef Data) {
   const char *Current = Data.begin();
 
+  // Root Signature headers expects 6 integers to be present.
+  if (Data.size() < 6 * sizeof(uint32_t)) {
+    return parseFailed("Invalid data. Too small.");
+  }
+
   Version = support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 

llvm/unittests/Object/DXContainerTest.cpp

@@ -823,23 +823,38 @@ TEST(DXCFile, MalformedSignature) {
 }
 
 TEST(RootSignature, ParseRootFlags) {
-  uint8_t Buffer[] = {
-      0x44, 0x58, 0x42, 0x43, 0x32, 0x9A, 0x53, 0xD8, 0xEC, 0xBE, 0x35, 0x6F,
-      0x05, 0x39, 0xE1, 0xFE, 0x31, 0x20, 0xF0, 0xC1, 0x01, 0x00, 0x00, 0x00,
-      0x44, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
-      0x52, 0x54, 0x53, 0x30, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-  };
-  DXContainer C =
-      llvm::cantFail(DXContainer::create(getMemoryBuffer<180>(Buffer)));
+  {
+    uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x32, 0x9A, 0x53, 0xD8, 0xEC, 0xBE, 0x35, 0x6F,
+        0x05, 0x39, 0xE1, 0xFE, 0x31, 0x20, 0xF0, 0xC1, 0x01, 0x00, 0x00, 0x00,
+        0x44, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
+        0x52, 0x54, 0x53, 0x30, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    };
+    DXContainer C =
+        llvm::cantFail(DXContainer::create(getMemoryBuffer<180>(Buffer)));
+
+    const auto &RS = C.getRootSignature();
+    ASSERT_TRUE(RS.has_value());
+    ASSERT_EQ(RS->getVersion(), 2);
+    ASSERT_EQ(RS->getNumParameters(), 0);
+    ASSERT_EQ(RS->getRootParametersOffset(), 0);
+    ASSERT_EQ(RS->getNumStaticSamplers(), 0);
+    ASSERT_EQ(RS->getStaticSamplersOffset(), 0);
+    ASSERT_EQ(RS->getFlags(), 0x01);
+  }
 
-  const auto &RS = C.getRootSignature();
-  ASSERT_TRUE(RS.has_value());
-  ASSERT_EQ(RS->getVersion(), 2);
-  ASSERT_EQ(RS->getNumParameters(), 0);
-  ASSERT_EQ(RS->getRootParametersOffset(), 0);
-  ASSERT_EQ(RS->getNumStaticSamplers(), 0);
-  ASSERT_EQ(RS->getStaticSamplersOffset(), 0);
-  ASSERT_EQ(RS->getFlags(), 0x01);
+  {
+    uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x32, 0x9A, 0x53, 0xD8, 0xEC, 0xBE, 0x35,
+        0x6F, 0x05, 0x39, 0xE1, 0xFE, 0x31, 0x20, 0xF0, 0xC1, 0x01, 0x00,
+        0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24,
+        0x00, 0x00, 0x00, 0x52, 0x54, 0x53, 0x30, 0x18, 0x00, 0x00, 0x00,
+        0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    };
+    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<44>(Buffer)),
+                         FailedWithMessage("Invalid data. Too small."));
+  }
 }