Don't crash if ivar_getTypeEncoding returns NULL.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index ff45f13b69479f070d19241ad3df17c045aace9e..cf357086deaad9f5c2c875f5c02a8244dd9a8cfc 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -73,8 +73,9 @@ struct Type_privateData :
     Type_privateData(sig::Type *type) :
         ffi_(NULL)
     {
     Type_privateData(sig::Type *type) :
         ffi_(NULL)
     {

-        if (type != NULL)
-            Set(type);
+        // XXX: just in case I messed up migrating
+        _assert(type != NULL);
+        Set(type);

     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {
     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {


@@ -85,8 +86,6 @@ struct Type_privateData :
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {

-            ffi_ = new(*pool_) ffi_type;
-

             sig::Element element;
             element.name = NULL;
             element.type = type_;
             sig::Element element;
             element.name = NULL;
             element.type = type_;


@@ -98,6 +97,8 @@ struct Type_privateData :
 
             ffi_cif cif;
             sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);
 
             ffi_cif cif;
             sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);

+
+            ffi_ = new(*pool_) ffi_type;

             *ffi_ = *cif.rtype;
         }
 
             *ffi_ = *cif.rtype;
         }
 


@@ -170,7 +171,7 @@ struct Functor :
     sig::Signature signature_;
     ffi_cif cif_;
 
     sig::Signature signature_;
     ffi_cif cif_;
 

-    Functor(sig::Signature &signature, void (*value)()) :
+    Functor(const sig::Signature &signature, void (*value)()) :

         CYValue(reinterpret_cast<void *>(value))
     {
         sig::Copy(*pool_, signature_, signature);
         CYValue(reinterpret_cast<void *>(value))
     {
         sig::Copy(*pool_, signature_, signature);


@@ -189,6 +190,7 @@ struct Functor :
     }
 
     static JSStaticFunction const * const StaticFunctions;
     }
 
     static JSStaticFunction const * const StaticFunctions;

+    static JSStaticValue const * const StaticValues;

 }; }
 
 struct Closure_privateData :
 }; }
 
 struct Closure_privateData :


@@ -197,8 +199,8 @@ struct Closure_privateData :
     JSGlobalContextRef context_;
     JSObjectRef function_;
 
     JSGlobalContextRef context_;
     JSObjectRef function_;
 

-    Closure_privateData(JSContextRef context, JSObjectRef function, const char *type) :
-        cy::Functor(type, NULL),
+    Closure_privateData(JSContextRef context, JSObjectRef function, const sig::Signature &signature) :
+        cy::Functor(signature, NULL),

         context_(CYGetJSContext(context)),
         function_(function)
     {
         context_(CYGetJSContext(context)),
         function_(function)
     {


@@ -212,7 +214,7 @@ struct Closure_privateData :
     }
 };
 
     }
 };
 

-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *));
+Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, void (*callback)(ffi_cif *, void *, void **, void *));

 void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));
 
 #endif/*CYCRIPT_INTERNAL_HPP*/
 void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));
 
 #endif/*CYCRIPT_INTERNAL_HPP*/