add: check string max length

neil-wu · Jul 31, 2021 · ff4dd8f · ff4dd8f
1 parent 630499b
commit ff4dd8f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Demo/SwiftDump b/Demo/SwiftDump
diff --git a/SwiftDump/SwiftDump/SDParser.swift b/SwiftDump/SwiftDump/SDParser.swift
@@ -627,11 +627,19 @@ func dumpFieldDescriptor(loader: SDFileLoader, fieldDescriptorPtr: SDPointer, to
         let typeNamePtr = loader.readMove(fieldAddr.add(4)).fix();
         let typeName = loader.readStr(typeNamePtr);
 
+        if let type = typeName, (type.count <= 0 || type.count > 100) {
+            continue
+        }
+
         let fieldNamePtr = loader.readMove(fieldAddr.add(8)).fix();
         let fieldName = loader.readStr(fieldNamePtr);
 
+        if let field = fieldName, (field.count <= 0 || field.count > 100) {
+            continue
+        }
 
         if let type = typeName, let field = fieldName {
+
             let realType = getTypeFromMangledName(type);
             let fieldObj = SDNominalObjField();
             fieldObj.name = field; // name: field, type: realType

diff --git a/SwiftDump/SwiftDump/Util/Ext.swift b/SwiftDump/SwiftDump/Util/Ext.swift
@@ -152,6 +152,10 @@ extension Data {
             }
         }
 
+        if (result.count > 10000) {
+            return nil
+        }
+
         let tmp = result.reduce("0x") { (result, val:UInt8) -> String in
             return result + String(format: "%02x", val);
         }

diff --git a/SwiftDump/SwiftDump/Util/RuntimeBridge.swift b/SwiftDump/SwiftDump/Util/RuntimeBridge.swift
@@ -69,7 +69,13 @@ func getTypeFromMangledName(_ str: String) -> String {
     guard let ptr = str.toPointer() else {
         return str;
     }
-    guard let typeRet: Any.Type = _getTypeByMangledNameInContext(ptr, str.count, genericContext: nil, genericArguments: nil) else {
+
+    var useCnt:Int = str.count
+    if (str.hasSuffix("_pG")) {
+        useCnt = useCnt - 3
+    }
+
+    guard let typeRet: Any.Type = _getTypeByMangledNameInContext(ptr, useCnt, genericContext: nil, genericArguments: nil) else {
         return str;
     }