JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / API / ObjcRuntimeExtras.h

diff --git a/API/ObjcRuntimeExtras.h b/API/ObjcRuntimeExtras.h
index 48c11209396befd29a5b382b41bdc8ed31a87389..c85bc9225167dc9d84d0f880bcb81bd420efda4c 100644 (file)
--- a/API/ObjcRuntimeExtras.h
+++ b/API/ObjcRuntimeExtras.h
@@ -192,9 +192,19 @@ typename DelegateType::ResultType parseObjCType(const char*& position)
         }
 
         if (*position == '"') {
-            const char* begin = ++position;
-            position = index(position, '"');
-            return DelegateType::typeOfClass(begin, position++);
+            const char* begin = position + 1;
+            const char* protocolPosition = strchr(begin, '<');
+            const char* endOfType = strchr(begin, '"');
+            position = endOfType + 1;
+
+            // There's no protocol involved in this type, so just handle the class name.
+            if (!protocolPosition || protocolPosition > endOfType)
+                return DelegateType::typeOfClass(begin, endOfType);
+            // We skipped the class name and went straight to the protocol, so this is an id type.
+            if (begin == protocolPosition)
+                return DelegateType::typeId();
+            // We have a class name with a protocol. For now, ignore the protocol.
+            return DelegateType::typeOfClass(begin, protocolPosition);
         }
 
         return DelegateType::typeId();