Fix crash disassembling root signature in DXIL metadata

baldurk · Nov 1, 2023 · b103d1f · b103d1f
1 parent 8805afd
commit b103d1f
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
@@ -2030,28 +2030,35 @@ rdcstr Constant::toString(bool withType) const
   }
   else if(type->type == Type::Array)
   {
-    ret += "[";
-    for(size_t i = 0; i < members->size(); i++)
+    if(!members && !str.empty())
     {
-      if(i > 0)
-        ret += ", ";
-
-      if(Literal *l = cast<Literal>(members->at(i)))
+      ret += "c" + escapeString(str);
+    }
+    else
+    {
+      ret += "[";
+      for(size_t i = 0; i < members->size(); i++)
       {
-        if(withType)
-          ret += type->inner->toString() + " ";
+        if(i > 0)
+          ret += ", ";
 
-        ShaderValue v;
-        v.u64v[0] = l->literal;
+        if(Literal *l = cast<Literal>(members->at(i)))
+        {
+          if(withType)
+            ret += type->inner->toString() + " ";
 
-        shaderValAppendToString(type->inner, v, 0, ret);
-      }
-      else
-      {
-        ret += members->at(i)->toString(withType);
+          ShaderValue v;
+          v.u64v[0] = l->literal;
+
+          shaderValAppendToString(type->inner, v, 0, ret);
+        }
+        else
+        {
+          ret += members->at(i)->toString(withType);
+        }
       }
+      ret += "]";
     }
-    ret += "]";
   }
   else if(type->type == Type::Struct)
   {