Print NULL instead of crashing for CString.toCYON.

[cycript.git] / sig / ffi_type.cpp

diff --git a/sig/ffi_type.cpp b/sig/ffi_type.cpp
index 0cd79814b7cb0c4aed0ee68b36e40257fa50bb07..b75d6066feb665ec4df18d054028c7a27192ad7e 100644 (file)
--- a/sig/ffi_type.cpp
+++ b/sig/ffi_type.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -87,7 +87,7 @@ ffi_type *ObjectiveC(CYPool &pool, struct Type *type) {
             _assert(false);
         break;
 
-        case char_P: return &ffi_type_schar;
+        case schar_P: return &ffi_type_schar;
         case double_P: return &ffi_type_double;
         case float_P: return &ffi_type_float;
         case int_P: return &ffi_type_sint;
@@ -96,6 +96,7 @@ ffi_type *ObjectiveC(CYPool &pool, struct Type *type) {
         case short_P: return &ffi_type_sshort;
 
         case void_P: return &ffi_type_void;
+        case char_P: return &ffi_type_schar;
 
         case struct_P: {
             ffi_type *aggregate(new(pool) ffi_type());
@@ -133,7 +134,7 @@ ffi_type *Java(CYPool &pool, struct Type *type) {
         case array_P: return &ffi_type_pointer;
         case pointer_P: return &ffi_type_pointer;
         case bit_P: _assert(false); break;
-        case char_P: return &ffi_type_schar;
+        case schar_P: return &ffi_type_schar;
         case double_P: return &ffi_type_double;
         case float_P: return &ffi_type_double;
         case int_P: return &ffi_type_sint;
@@ -141,6 +142,7 @@ ffi_type *Java(CYPool &pool, struct Type *type) {
         case longlong_P: return &ffi_type_slonglong;
         case short_P: return &ffi_type_sshort;
         case void_P: return &ffi_type_void;
+        case char_P: return &ffi_type_schar;
         case struct_P: return &ffi_type_pointer;
 
         default: