Do not ever use NULL type_s, even for ? encoding.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index b4dd4a1b09502e70ed2edb55b3e7d41a19de086b..7c278b4afc1851a1b04f811872bbd212352a2af7 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -73,8 +73,9 @@ struct Type_privateData :
     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) {
@@ -85,8 +86,6 @@ struct Type_privateData :
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {
-            ffi_ = new(*pool_) ffi_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_ = new(*pool_) ffi_type;
             *ffi_ = *cif.rtype;
         }