Fixed a stupid set of bugs that broke HelloCycript: first a NULL dereference in sig...

diff --git a/Library.mm b/Library.mm
index 9cb0060e14d0b3db5dd55c37fcf7694c375f16bf..252f9a40b84093cbef107e494e9f5d43b3bd3350 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -2016,8 +2016,10 @@ MSHook(void, objc_registerClassPair, Class _class) {
 
 static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
 
 static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {

+        if (count != 1)
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to objc_registerClassPair" userInfo:nil];

         CYPool pool;
         CYPool pool;

-        Class _class(CYCastNSObject(pool, context, object));
+        Class _class(CYCastNSObject(pool, context, arguments[0]));

         $objc_registerClassPair(_class);
         return CYJSUndefined(context);
     } CYCatch
         $objc_registerClassPair(_class);
         return CYJSUndefined(context);
     } CYCatch

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 18f0668f4e094d50c8a4964248790f74adef52d5..2f007de986ba67abc9d3c1f43e047162bca0b8fc 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -164,8 +164,9 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
                 type->data.data.type = NULL;
             } else {
                 type->data.data.type = Parse_(pool, name, eos, named, callback);
                 type->data.data.type = NULL;
             } else {
                 type->data.data.type = Parse_(pool, name, eos, named, callback);

-                if (type->data.data.type->primitive == void_P)
-                    type->data.data.type = NULL;
+                sig::Type *&target(type->data.data.type);
+                if (target != NULL && target->primitive == void_P)
+                    target = NULL;

             }
         break;
 
             }
         break;