Do not use corrupt struct to store type reference.

[cycript.git] / Execute.cpp

diff --git a/Execute.cpp b/Execute.cpp
index 527d2cc39786974828502ca34055ff4964327551..9af250c536f8d18c2823d8013f3d6af88ef7b3d7 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -148,6 +148,14 @@ const char *CYPoolCString(CYPool &pool, CYUTF8String utf8) {
     return pool.strndup(utf8.data, utf8.size);
 }
 
     return pool.strndup(utf8.data, utf8.size);
 }
 

+CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8) {
+    return {pool.strndup(utf8.data, utf8.size), utf8.size};
+}
+
+_visible CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value) {
+    return {pool.strndup(value.data(), value.size()), value.size()};
+}
+

 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) {
     return CYPoolUTF8String(pool, CYCastUTF16String(value));
 }
 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) {
     return CYPoolUTF8String(pool, CYCastUTF16String(value));
 }


@@ -777,6 +785,7 @@ void Enum::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data
 
 void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(!overlap);
 
 void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
     _assert(!overlap);

+    _assert(signature.count != _not(size_t));

 
     size_t offset(0);
     uint8_t *base(reinterpret_cast<uint8_t *>(data));
 
     size_t offset(0);
     uint8_t *base(reinterpret_cast<uint8_t *>(data));


@@ -869,6 +878,8 @@ JSValueRef Enum::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool i
 }
 
 JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
 }
 
 JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {

+    _assert(!overlap);
+    _assert(signature.count != _not(size_t));

     return Struct_privateData::Make(context, data, *this, ffi, context, owner);
 }
 
     return Struct_privateData::Make(context, data, *this, ffi, context, owner);
 }
 


@@ -1234,7 +1245,7 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
         element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
     }
 
         element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
     }
 

-    uint8_t value[cif->rtype->size];
+    uint8_t *value(pool.malloc<uint8_t>(std::max<size_t>(cif->rtype->size, sizeof(ffi_arg)), std::max<size_t>(cif->rtype->alignment, alignof(ffi_arg))));

 
     void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
     // XXX: this only supports one hook, but it is a bad idea anyway
 
     void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction;
     // XXX: this only supports one hook, but it is a bad idea anyway


@@ -1494,6 +1505,7 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou
             _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
             Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
             element.type = internal->type_;
             _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
             Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
             element.type = internal->type_;

+            _assert(element.type != NULL);

         }
 
         return CYMakeType(context, type);
         }
 
         return CYMakeType(context, type);


@@ -2244,17 +2256,43 @@ static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef objec
     _assert(count == 1);
     CYPool pool;
 
     _assert(count == 1);
     CYPool pool;
 

-    const char *name(CYPoolCString(pool, context, arguments[0]));
-    if (strchr(name, '/') == NULL && (
+    CYUTF8String name(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+    if (memchr(name.data, '/', name.size) == NULL && (

 #ifdef __APPLE__
 #ifdef __APPLE__

-        dlopen(pool.strcat("/System/Library/Frameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
-        dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+        dlopen(pool.strcat("/System/Library/Frameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||
+        dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL ||

 #endif
     false))
         return CYJSUndefined(context);
 
 #endif
     false))
         return CYJSUndefined(context);
 

-    JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
-    CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));
+    CYJSString path;
+    CYUTF8String code;
+
+    sqlite3_stmt *statement;
+
+    _sqlcall(sqlite3_prepare(database_,
+        "select "
+            "\"module\".\"code\", "
+            "\"module\".\"flags\" "
+        "from \"module\" "
+        "where"
+            " \"module\".\"name\" = ?"
+        " limit 1"
+    , -1, &statement, NULL));
+
+    _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));
+
+    if (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE) {
+        code.data = static_cast<const char *>(sqlite3_column_blob(statement, 0));
+        code.size = sqlite3_column_bytes(statement, 0);
+        path = CYJSString(name);
+        code = CYPoolUTF8String(pool, code);
+    } else {
+        JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve"))));
+        path = CYJSString(context, CYCallAsFunction(context, resolve, NULL, 1, arguments));
+    }
+
+    _sqlcall(sqlite3_finalize(statement));

 
     CYJSString property("exports");
 
 
     CYJSString property("exports");
 


@@ -2266,11 +2304,13 @@ static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef objec
         JSObjectRef module(CYCastJSObject(context, cache));
         result = CYGetProperty(context, module, property);
     } else {
         JSObjectRef module(CYCastJSObject(context, cache));
         result = CYGetProperty(context, module, property);
     } else {

-        CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path)));
-        _assert(code.data != NULL);
+        if (code.data == NULL) {
+            code = CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path));
+            _assert(code.data != NULL);
+        }

 
 

-        size_t length(strlen(name));
-        if (length >= 5 && strcmp(name + length - 5, ".json") == 0) {
+        size_t length(name.size);
+        if (length >= 5 && strncmp(name.data + length - 5, ".json", 5) == 0) {

             JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON")));
             JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse"))));
             JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) };
             JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON")));
             JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse"))));
             JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) };