Merge pull request #15 from defold/crash_issue_fix

Fix crash related to lua stack

extension-iap/lib/web/library_facebook_iap.js

@@ -31,7 +31,7 @@ var LibraryFacebookIAP = {
                 FB_PAYMENT_RESPONSE_APPINVALIDITEMPARAM : 1383051
             },
 
-            http_callback: function(xmlhttp, callback, lua_state, products, product_ids, product_count, url_index, url_count) {
+            http_callback: function(xmlhttp, callback, lua_callback, products, product_ids, product_count, url_index, url_count) {
                 if (xmlhttp.readyState == 4) {
                     if(xmlhttp.status == 200) {
                         var xmlDoc = document.createElement( 'html' );
@@ -72,11 +72,11 @@ var LibraryFacebookIAP = {
                     if(url_index == product_count-1) {
                         var productsJSON = JSON.stringify(products);
                         var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
-                        Runtime.dynCall('vii', callback, [lua_state, res_buf]);
+                        Runtime.dynCall('vii', callback, [lua_callback, res_buf]);
                     } else {
                         var xmlhttp = new XMLHttpRequest();
                         xmlhttp.onreadystatechange = function() {
-                            FBinner.http_callback(xmlhttp, callback, lua_state, products, product_ids, product_count, url_index+1);
+                            FBinner.http_callback(xmlhttp, callback, lua_callback, products, product_ids, product_count, url_index+1);
                         };
                         xmlhttp.open("GET", product_ids[url_index+1], true);
                         xmlhttp.send();
@@ -86,7 +86,7 @@ var LibraryFacebookIAP = {
 
         },
 
-        dmIAPFBList: function(params, callback, lua_state) {
+        dmIAPFBList: function(params, callback, lua_callback) {
             var product_ids = Pointer_stringify(params).trim().split(',');
             var product_count = product_ids.length;
             if(product_count == 0) {
@@ -96,7 +96,7 @@ var LibraryFacebookIAP = {
             products = {};
             var xmlhttp = new XMLHttpRequest();
             xmlhttp.onreadystatechange = function() {
-                FBinner.http_callback(xmlhttp, callback, lua_state, products, product_ids, product_count, 0);
+                FBinner.http_callback(xmlhttp, callback, lua_callback, products, product_ids, product_count, 0);
             };
             // chain of async http read of product files
             xmlhttp.open("GET", product_ids[0], true);
@@ -104,7 +104,7 @@ var LibraryFacebookIAP = {
         },
 
         // https://developers.facebook.com/docs/javascript/reference/FB.ui
-        dmIAPFBBuy: function(param_product_id, param_request_id, callback, lua_state) {
+        dmIAPFBBuy: function(param_product_id, param_request_id, callback, lua_callback) {
             var product_id = Pointer_stringify(param_product_id);
 
             var buy_params = {
@@ -144,7 +144,7 @@ var LibraryFacebookIAP = {
 
 	                    var productsJSON = JSON.stringify(result)
 	                    var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
-	                    Runtime.dynCall('viii', callback, [lua_state, res_buf, 0]);
+	                    Runtime.dynCall('viii', callback, [lua_callback, res_buf, 0]);
 
 	                } else {
 
@@ -157,7 +157,7 @@ var LibraryFacebookIAP = {
 	                        reason = FBinner.BillingResponse.BILLING_RESPONSE_RESULT_ERROR;
 	                        console.log("Unknown response: ", response);
 	                    }
-	                    Runtime.dynCall('viii', callback, [lua_state, 0, reason]);
+	                    Runtime.dynCall('viii', callback, [lua_callback, 0, reason]);
 	                }
             	}
             );

extension-iap/src/iap_android.cpp

@@ -27,20 +27,15 @@ struct IAP
     IAP()
     {
         memset(this, 0, sizeof(*this));
-        m_Callback = LUA_NOREF;
-        m_Self = LUA_NOREF;
-        m_Listener.m_Callback = LUA_NOREF;
-        m_Listener.m_Self = LUA_NOREF;
         m_autoFinishTransactions = true;
         m_ProviderId = PROVIDER_ID_GOOGLE;
     }
     int             m_InitCount;
-    int             m_Callback;
-    int             m_Self;
     bool            m_autoFinishTransactions;
     int             m_ProviderId;
-    lua_State*      m_L;
-    IAPListener     m_Listener;
+
+    dmScript::LuaCallbackInfo* m_ProductCallback;
+    dmScript::LuaCallbackInfo* m_Listener;
 
     jobject         m_IAP;
     jobject         m_IAPJNI;
@@ -56,22 +51,9 @@ struct IAP
 
 static IAP g_IAP;
 
-static void ResetCallback(lua_State* L)
-{
-    if (g_IAP.m_Callback != LUA_NOREF) {
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-        g_IAP.m_Callback = LUA_NOREF;
-        g_IAP.m_Self = LUA_NOREF;
-        g_IAP.m_L = 0;
-    }
-}
-
 static int IAP_List(lua_State* L)
 {
     int top = lua_gettop(L);
-    ResetCallback(L);
-
     char* buf = IAP_List_CreateBuffer(L);
     if( buf == 0 )
     {
@@ -79,14 +61,10 @@ static int IAP_List(lua_State* L)
         return 0;
     }
 
-    luaL_checktype(L, 2, LUA_TFUNCTION);
-    lua_pushvalue(L, 2);
-    g_IAP.m_Callback = dmScript::Ref(L, LUA_REGISTRYINDEX);
+    if (g_IAP.m_ProductCallback)
+        dmScript::DestroyCallback(g_IAP.m_ProductCallback);
 
-    dmScript::GetInstance(L);
-    g_IAP.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    g_IAP.m_L = dmScript::GetMainThread(L);
+    g_IAP.m_ProductCallback = dmScript::CreateCallback(L, 2);
 
     JNIEnv* env = Attach();
     jstring products = env->NewStringUTF(buf);
@@ -180,22 +158,13 @@ static int IAP_Restore(lua_State* L)
 static int IAP_SetListener(lua_State* L)
 {
     IAP* iap = &g_IAP;
-    luaL_checktype(L, 1, LUA_TFUNCTION);
-    lua_pushvalue(L, 1);
-    int cb = dmScript::Ref(L, LUA_REGISTRYINDEX);
 
-    bool had_previous = false;
-    if (iap->m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Callback);
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Self);
-        had_previous = true;
-    }
+    bool had_previous = iap->m_Listener != 0;
 
-    iap->m_Listener.m_L = dmScript::GetMainThread(L);
-    iap->m_Listener.m_Callback = cb;
+    if (iap->m_Listener)
+        dmScript::DestroyCallback(iap->m_Listener);
 
-    dmScript::GetInstance(L);
-    iap->m_Listener.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
+    iap->m_Listener = dmScript::CreateCallback(L, 1);
 
     // On first set listener, trigger process old ones.
     if (!had_previous) {
@@ -238,6 +207,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult__ILjava_lang_
     }
 
     IAPCommand cmd;
+    cmd.m_Callback = g_IAP.m_ProductCallback;
     cmd.m_Command = IAP_PRODUCT_RESULT;
     cmd.m_ResponseCode = responseCode;
     if (pl)
@@ -257,6 +227,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
     }
 
     IAPCommand cmd;
+    cmd.m_Callback = g_IAP.m_Listener;
     cmd.m_Command = IAP_PURCHASE_RESULT;
     cmd.m_ResponseCode = responseCode;
     if (pd)
@@ -273,25 +244,11 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
 
 static void HandleProductResult(const IAPCommand* cmd)
 {
-    lua_State* L = g_IAP.m_L;
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
-    if (g_IAP.m_Callback == LUA_NOREF) {
-        dmLogError("No callback set");
-        return;
-    }
-
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
-        dmLogError("Could not run IAP callback because the instance has been deleted.");
-        lua_pop(L, 2);
         assert(top == lua_gettop(L));
         return;
     }
@@ -320,42 +277,23 @@ static void HandleProductResult(const IAPCommand* cmd)
         IAP_PushError(L, "failed to fetch product", REASON_UNSPECIFIED);
     }
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("Error running callback: %s", lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
 
-    dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-    dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-    g_IAP.m_Callback = LUA_NOREF;
-    g_IAP.m_Self = LUA_NOREF;
+    dmScript::TeardownCallback(cmd->m_Callback);
+    dmScript::DestroyCallback(cmd->m_Callback);
+    assert(g_IAP.m_ProductCallback == cmd->m_Callback);
+    g_IAP.m_ProductCallback = 0;
 
     assert(top == lua_gettop(L));
 }
 
 static void HandlePurchaseResult(const IAPCommand* cmd)
 {
-    lua_State* L = g_IAP.m_Listener.m_L;
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
-    if (g_IAP.m_Listener.m_Callback == LUA_NOREF) {
-        dmLogError("No callback set");
-        return;
-    }
-
-
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
-
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
-        dmLogError("Could not run IAP callback because the instance has been deleted.");
-        lua_pop(L, 2);
         assert(top == lua_gettop(L));
         return;
     }
@@ -393,11 +331,9 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
         IAP_PushError(L, "failed to buy product", REASON_UNSPECIFIED);
     }
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("Error running callback: %s", lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::TeardownCallback(cmd->m_Callback);
 
     assert(top == lua_gettop(L));
 }
@@ -500,12 +436,9 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
     --g_IAP.m_InitCount;
 
-    if (params->m_L == g_IAP.m_Listener.m_L && g_IAP.m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-        g_IAP.m_Listener.m_L = 0;
-        g_IAP.m_Listener.m_Callback = LUA_NOREF;
-        g_IAP.m_Listener.m_Self = LUA_NOREF;
+    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+        g_IAP.m_Listener = 0;
     }
 
     if (g_IAP.m_InitCount == 0) {

extension-iap/src/iap_emscripten.cpp

@@ -15,152 +15,97 @@ struct IAP
     IAP()
     {
         memset(this, 0, sizeof(*this));
-        m_Callback = LUA_NOREF;
-        m_Self = LUA_NOREF;
-        m_Listener.m_Callback = LUA_NOREF;
-        m_Listener.m_Self = LUA_NOREF;
         m_autoFinishTransactions = true;
     }
-    int                  m_InitCount;
-    int                  m_Callback;
-    int                  m_Self;
-    bool                 m_autoFinishTransactions;
-    lua_State*           m_L;
-    IAPListener          m_Listener;
 
+    dmScript::LuaCallbackInfo*  m_Listener;
+    int                         m_InitCount;
+    bool                        m_autoFinishTransactions;
 } g_IAP;
 
-typedef void (*OnIAPFBList)(void *L, const char* json);
-typedef void (*OnIAPFBListenerCallback)(void *L, const char* json, int error_code);
+typedef void (*OnIAPFBList)(void* luacallback, const char* json);
+typedef void (*OnIAPFBListenerCallback)(void* luacallback, const char* json, int error_code);
 
 extern "C" {
     // Implementation in library_facebook_iap.js
-    void dmIAPFBList(const char* item_ids, OnIAPFBList callback, lua_State* L);
-    void dmIAPFBBuy(const char* item_id, const char* request_id, OnIAPFBListenerCallback callback, lua_State* L);
+    void dmIAPFBList(const char* item_ids, OnIAPFBList callback, dmScript::LuaCallbackInfo* luacallback);
+    void dmIAPFBBuy(const char* item_id, const char* request_id, OnIAPFBListenerCallback callback, dmScript::LuaCallbackInfo* luacallback);
 }
 
-
-static void VerifyCallback(lua_State* L)
+static void IAPList_Callback(void* luacallback, const char* result_json)
 {
-    if (g_IAP.m_Callback != LUA_NOREF) {
-        dmLogError("Unexpected callback set");
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-        g_IAP.m_Callback = LUA_NOREF;
-        g_IAP.m_Self = LUA_NOREF;
-        g_IAP.m_L = 0;
+    dmScript::LuaCallbackInfo* callback = (dmScript::LuaCallbackInfo*)luacallback;
+    lua_State* L = dmScript::GetCallbackLuaContext(callback);
+    DM_LUA_STACK_CHECK(L, 0);
+
+    if (!dmScript::SetupCallback(callback))
+    {
+        dmScript::DestroyCallback(callback);
+        return;
     }
-}
 
-void IAPList_Callback(void* Lv, const char* result_json)
-{
-    lua_State* L = (lua_State*) Lv;
-    if (g_IAP.m_Callback != LUA_NOREF) {
-        int top = lua_gettop(L);
-        int callback = g_IAP.m_Callback;
-        lua_rawgeti(L, LUA_REGISTRYINDEX, callback);
-
-        // Setup self
-        lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-        lua_pushvalue(L, -1);
-        dmScript::SetInstance(L);
-
-        if (!dmScript::IsInstanceValid(L))
-        {
-            dmLogError("Could not run iap facebook callback because the instance has been deleted.");
-            lua_pop(L, 2);
-            assert(top == lua_gettop(L));
-            return;
-        }
-        if(result_json != 0)
-        {
-            dmJson::Document doc;
-            dmJson::Result r = dmJson::Parse(result_json, &doc);
-            if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
-                char err_str[128];
-                if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
-                    dmLogError("Failed converting list result JSON to Lua; %s", err_str);
-                    lua_pushnil(L);
-                    IAP_PushError(L, "Failed converting list result JSON to Lua", REASON_UNSPECIFIED);
-                } else {
-                    lua_pushnil(L);
-                }
-            } else {
-                dmLogError("Failed to parse list result JSON (%d)", r);
+    if(result_json != 0)
+    {
+        dmJson::Document doc;
+        dmJson::Result r = dmJson::Parse(result_json, &doc);
+        if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
+            char err_str[128];
+            if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
+                dmLogError("Failed converting list result JSON to Lua; %s", err_str);
+                lua_pushnil(L);
+                IAP_PushError(L, "Failed converting list result JSON to Lua", REASON_UNSPECIFIED);
+            } else {
                 lua_pushnil(L);
-                IAP_PushError(L, "Failed to parse list result JSON", REASON_UNSPECIFIED);
             }
-            dmJson::Free(&doc);
-        }
-        else
-        {
-            dmLogError("Got empty list result.");
+        } else {
+            dmLogError("Failed to parse list result JSON (%d)", r);
             lua_pushnil(L);
-            IAP_PushError(L, "Got empty list result.", REASON_UNSPECIFIED);
+            IAP_PushError(L, "Failed to parse list result JSON", REASON_UNSPECIFIED);
         }
-
-        int ret = lua_pcall(L, 3, 0, 0);
-        if (ret != 0) {
-            dmLogError("Error running callback: %s", lua_tostring(L, -1));
-            lua_pop(L, 1);
-        }
-        assert(top == lua_gettop(L));
-        dmScript::Unref(L, LUA_REGISTRYINDEX, callback);
-
-        g_IAP.m_Callback = LUA_NOREF;
-    } else {
-        dmLogError("No callback set");
+        dmJson::Free(&doc);
+    }
+    else
+    {
+        dmLogError("Got empty list result.");
+        lua_pushnil(L);
+        IAP_PushError(L, "Got empty list result.", REASON_UNSPECIFIED);
     }
 
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::DestroyCallback(callback);
+    dmScript::TeardownCallback(callback);
 }
 
-int IAP_List(lua_State* L)
+static int IAP_List(lua_State* L)
 {
-    int top = lua_gettop(L);
-    VerifyCallback(L);
+    DM_LUA_STACK_CHECK(L, 0);
 
     char* buf = IAP_List_CreateBuffer(L);
     if( buf == 0 )
     {
-        assert(top == lua_gettop(L));
         return 0;
     }
 
-    luaL_checktype(L, 2, LUA_TFUNCTION);
-    lua_pushvalue(L, 2);
-    g_IAP.m_Callback = dmScript::Ref(L, LUA_REGISTRYINDEX);
-    dmScript::GetInstance(L);
-    g_IAP.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-    g_IAP.m_L = dmScript::GetMainThread(L);
-    dmIAPFBList(buf, (OnIAPFBList)IAPList_Callback, g_IAP.m_L);
+    dmScript::LuaCallbackInfo* callback = dmScript::CreateCallback(L, 2);
+
+    dmIAPFBList(buf, (OnIAPFBList)IAPList_Callback, callback);
 
     free(buf);
-    assert(top == lua_gettop(L));
     return 0;
 }
 
-void IAPListener_Callback(void* Lv, const char* result_json, int error_code)
+static void IAPListener_Callback(void* luacallback, const char* result_json, int error_code)
 {
-    lua_State* L = g_IAP.m_Listener.m_L;
-    int top = lua_gettop(L);
-    if (g_IAP.m_Listener.m_Callback == LUA_NOREF) {
-        dmLogError("No callback set");
-        return;
-    }
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
+    dmScript::LuaCallbackInfo* callback = (dmScript::LuaCallbackInfo*)luacallback;
+    lua_State* L = dmScript::GetCallbackLuaContext(callback);
+    DM_LUA_STACK_CHECK(L, 0);
 
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
+    if (!dmScript::SetupCallback(callback))
     {
-        dmLogError("Could not run IAP callback because the instance has been deleted.");
-        lua_pop(L, 2);
-        assert(top == lua_gettop(L));
         return;
     }
+
     if (result_json) {
         dmJson::Document doc;
         dmJson::Result r = dmJson::Parse(result_json, &doc);
@@ -197,21 +142,22 @@ void IAPListener_Callback(void* Lv, const char* result_json, int error_code)
                 break;
         }
     }
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("Error running callback: %s", lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
-    assert(top == lua_gettop(L));
+
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::TeardownCallback(callback);
 }
 
 
-int IAP_Buy(lua_State* L)
+static int IAP_Buy(lua_State* L)
 {
-    if (g_IAP.m_Listener.m_Callback == LUA_NOREF) {
+    DM_LUA_STACK_CHECK(L, 0);
+
+    if (!g_IAP.m_Listener) {
         dmLogError("No callback set");
         return 0;
     }
+
     int top = lua_gettop(L);
     const char* id = luaL_checkstring(L, 1);
     const char* request_id = 0x0;
@@ -224,43 +170,34 @@ int IAP_Buy(lua_State* L)
         lua_pop(L, 2);
     }
 
-    dmIAPFBBuy(id, request_id, (OnIAPFBListenerCallback)IAPListener_Callback, L);
-    assert(top == lua_gettop(L));
+    dmIAPFBBuy(id, request_id, (OnIAPFBListenerCallback)IAPListener_Callback, g_IAP.m_Listener);
     return 0;
 }
 
-int IAP_SetListener(lua_State* L)
+static int IAP_SetListener(lua_State* L)
 {
-    IAP* iap = &g_IAP;
-    luaL_checktype(L, 1, LUA_TFUNCTION);
-    lua_pushvalue(L, 1);
-    int cb = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    if (iap->m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Callback);
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Self);
-    }
-    iap->m_Listener.m_L = dmScript::GetMainThread(L);
-    iap->m_Listener.m_Callback = cb;
-    dmScript::GetInstance(L);
-    iap->m_Listener.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
+    DM_LUA_STACK_CHECK(L, 0);
+    if (g_IAP.m_Listener)
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+    g_IAP.m_Listener = dmScript::CreateCallback(L, 1);
     return 0;
 }
 
-int IAP_Finish(lua_State* L)
+static int IAP_Finish(lua_State* L)
 {
     return 0;
 }
 
-int IAP_Restore(lua_State* L)
+static int IAP_Restore(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 1);
     lua_pushboolean(L, 0);
     return 1;
 }
 
-int IAP_GetProviderId(lua_State* L)
+static int IAP_GetProviderId(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 1);
     lua_pushinteger(L, PROVIDER_ID_FACEBOOK);
     return 1;
 }
@@ -276,13 +213,13 @@ static const luaL_reg IAP_methods[] =
     {0, 0}
 };
 
-dmExtension::Result InitializeIAP(dmExtension::Params* params)
+static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
     if (g_IAP.m_InitCount == 0) {
         g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
     }
     g_IAP.m_InitCount++;
-    lua_State*L = params->m_L;
+    lua_State* L = params->m_L;
     int top = lua_gettop(L);
     luaL_register(L, LIB_NAME, IAP_methods);
 
@@ -293,15 +230,13 @@ dmExtension::Result InitializeIAP(dmExtension::Params* params)
     return dmExtension::RESULT_OK;
 }
 
-dmExtension::Result FinalizeIAP(dmExtension::Params* params)
+static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
     --g_IAP.m_InitCount;
-    if (params->m_L == g_IAP.m_Listener.m_L && g_IAP.m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-        g_IAP.m_Listener.m_L = 0;
-        g_IAP.m_Listener.m_Callback = LUA_NOREF;
-        g_IAP.m_Listener.m_Self = LUA_NOREF;
+    if (g_IAP.m_Listener && g_IAP.m_InitCount == 0)
+    {
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+        g_IAP.m_Listener = 0;
     }
     return dmExtension::RESULT_OK;
 }

extension-iap/src/iap_ios.mm

@@ -23,12 +23,11 @@ struct IAP
     {
         memset(this, 0, sizeof(*this));
         m_AutoFinishTransactions = true;
-        IAP_ClearCallback(&m_Listener);
     }
     int                             m_InitCount;
     bool                            m_AutoFinishTransactions;
     NSMutableDictionary*            m_PendingTransactions;
-    IAPListener                     m_Listener;
+    dmScript::LuaCallbackInfo*      m_Listener;
     IAPCommandQueue                 m_CommandQueue;
     SKPaymentTransactionObserver*   m_Observer;
 };
@@ -101,15 +100,14 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 
 
 @interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate>
-    @property IAPListener m_Callback;
+    @property dmScript::LuaCallbackInfo* m_Callback;
     @property (assign) SKProductsRequest* m_Request;
 @end
 
 @implementation SKProductsRequestDelegate
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response{
 
-    IAPListener callback = self.m_Callback;
-    if (!IAP_CallbackIsValid(&callback)) {
+    if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
     }
@@ -141,7 +139,7 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 
     IAPCommand cmd;
     cmd.m_Command = IAP_PRODUCT_RESULT;
-    cmd.m_Callback = callback;
+    cmd.m_Callback = self.m_Callback;
     cmd.m_Data = iap_response;
     IAP_Queue_Push(&g_IAP.m_CommandQueue, &cmd);
 }
@@ -151,10 +149,10 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPResponse* response = (IAPResponse*)cmd->m_Data;
 
-    lua_State* L = cmd->m_Callback.m_L;
+    lua_State* L = dmScript::GetCallbackLuaContext(g_IAP.m_Listener);
     int top = lua_gettop(L);
 
-    if (!IAP_SetupCallback(&cmd->m_Callback))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
         assert(top == lua_gettop(L));
         delete response;
@@ -188,13 +186,10 @@ static void HandleProductResult(IAPCommand* cmd)
     }
     lua_pushnil(L);
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("%d: Error running callback: %s", __LINE__, lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
 
-    IAP_UnregisterCallback(&cmd->m_Callback);
+    dmScript::TeardownCallback(cmd->m_Callback);
+    dmScript::DestroyCallback(cmd->m_Callback);
 
     delete response;
     assert(top == lua_gettop(L));
@@ -203,8 +198,7 @@ static void HandleProductResult(IAPCommand* cmd)
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error{
     dmLogWarning("SKProductsRequest failed: %s", [error.localizedDescription UTF8String]);
 
-    IAPListener callback = self.m_Callback;
-    if (!IAP_CallbackIsValid(&callback)) {
+    if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
     }
@@ -215,7 +209,7 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPCommand cmd;
     cmd.m_Command = IAP_PRODUCT_RESULT;
-    cmd.m_Callback = callback;
+    cmd.m_Callback = self.m_Callback;
     cmd.m_Data = response;
 
     IAP_Queue_Push(&g_IAP.m_CommandQueue, &cmd);
@@ -300,13 +294,12 @@ static void PushTransaction(lua_State* L, IAPTransaction* transaction)
 
 static void HandlePurchaseResult(IAPCommand* cmd)
 {
-
     IAPTransaction* transaction = (IAPTransaction*)cmd->m_Data;
 
-    lua_State* L = cmd->m_Callback.m_L;
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
-    if (!IAP_SetupCallback(&cmd->m_Callback))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
         assert(top == lua_gettop(L));
         return;
@@ -321,11 +314,9 @@ static void HandlePurchaseResult(IAPCommand* cmd)
         lua_pushnil(L);
     }
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("%d: Error running callback: %s", __LINE__, lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::TeardownCallback(cmd->m_Callback);
 
     IAP_FreeTransaction(transaction);
 
@@ -344,8 +335,7 @@ static void HandlePurchaseResult(IAPCommand* cmd)
                 [self.m_IAP->m_PendingTransactions setObject:transaction forKey:[NSNumber numberWithInteger:trans_id_hash] ];
             }
 
-            bool has_listener = self.m_IAP->m_Listener.m_Callback != LUA_NOREF;
-            if (!has_listener)
+            if (!self.m_IAP->m_Listener)
                 continue;
 
             IAPTransaction* iap_transaction = new IAPTransaction;
@@ -394,10 +384,7 @@ static int IAP_List(lua_State* L)
     SKProductsRequest* products_request = [[SKProductsRequest alloc] initWithProductIdentifiers: product_identifiers];
     SKProductsRequestDelegate* delegate = [SKProductsRequestDelegate alloc];
 
-    IAPListener callback;
-    IAP_RegisterCallback(L, 2, &callback);
-    delegate.m_Callback = callback;
-
+    delegate.m_Callback = dmScript::CreateCallback(L, 2);
     delegate.m_Request = products_request;
     products_request.delegate = delegate;
     [products_request start];
@@ -486,8 +473,10 @@ static int IAP_SetListener(lua_State* L)
 {
     IAP* iap = &g_IAP;
 
-    IAP_UnregisterCallback(&iap->m_Listener);
-    IAP_RegisterCallback(L, 1, &iap->m_Listener);
+    if (iap->m_Listener)
+        dmScript::DestroyCallback(iap->m_Listener);
+
+    iap->m_Listener = dmScript::CreateCallback(L, 1);
 
     if (g_IAP.m_Observer == 0) {
         SKPaymentTransactionObserver* observer = [[SKPaymentTransactionObserver alloc] init];
@@ -577,8 +566,9 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 
     // TODO: Should we support one listener per lua-state?
     // Or just use a single lua-state...?
-    if (params->m_L == g_IAP.m_Listener.m_L) {
-        IAP_UnregisterCallback(&g_IAP.m_Listener);
+    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+        g_IAP.m_Listener = 0;
     }
 
     if (g_IAP.m_InitCount == 0) {

extension-iap/src/iap_private.cpp

@@ -7,65 +7,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-
-IAPListener::IAPListener() {
-    IAP_ClearCallback(this);
-}
-
-void IAP_ClearCallback(IAPListener* callback)
-{
-    callback->m_L = 0;
-    callback->m_Callback = LUA_NOREF;
-    callback->m_Self = LUA_NOREF;
-}
-
-void IAP_RegisterCallback(lua_State* L, int index, IAPListener* callback)
-{
-    luaL_checktype(L, index, LUA_TFUNCTION);
-    lua_pushvalue(L, index);
-    callback->m_Callback = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    dmScript::GetInstance(L);
-    callback->m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    callback->m_L = L;
-}
-
-void IAP_UnregisterCallback(IAPListener* callback)
-{
-    if (LUA_NOREF != callback->m_Callback)
-        dmScript::Unref(callback->m_L, LUA_REGISTRYINDEX, callback->m_Callback);
-    if (LUA_NOREF != callback->m_Self)
-        dmScript::Unref(callback->m_L, LUA_REGISTRYINDEX, callback->m_Self);
-    callback->m_Callback = LUA_NOREF;
-    callback->m_Self = LUA_NOREF;
-    callback->m_L = 0;
-}
-
-bool IAP_SetupCallback(IAPListener* callback)
-{
-    lua_State* L = callback->m_L;
-    lua_rawgeti(L, LUA_REGISTRYINDEX, callback->m_Callback);
-
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, callback->m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
-    {
-        dmLogError("Could not run callback because the instance has been deleted.");
-        lua_pop(L, 2);
-        return false;
-    }
-    return true;
-}
-
-bool IAP_CallbackIsValid(IAPListener* callback)
-{
-    return callback != 0 && callback->m_L != 0 && callback->m_Callback != LUA_NOREF && callback->m_Self != LUA_NOREF;
-}
-
 // Creates a comma separated string, given a table where all values are strings (or numbers)
 // Returns a malloc'ed string, which the caller must free
 char* IAP_List_CreateBuffer(lua_State* L)

extension-iap/src/iap_private.h

@@ -5,16 +5,6 @@
 
 #include <dmsdk/sdk.h>
 
-// TODO: Rename Callback
-struct IAPListener
-{
-    IAPListener();
-
-    lua_State* m_L;
-    int        m_Callback;
-    int        m_Self;
-};
-
 enum EIAPCommand
 {
 	IAP_PRODUCT_RESULT,
@@ -29,7 +19,7 @@ struct DM_ALIGNED(16) IAPCommand
     }
 
     // Used for storing eventual callback info (if needed)
-    IAPListener m_Callback;
+    dmScript::LuaCallbackInfo* m_Callback;
 
     // THe actual command payload
     int32_t  	m_Command;
@@ -43,12 +33,6 @@ struct IAPCommandQueue
     dmMutex::HMutex      m_Mutex;
 };
 
-void IAP_ClearCallback(IAPListener* callback);
-void IAP_RegisterCallback(lua_State* L, int index, IAPListener* callback);
-void IAP_UnregisterCallback(IAPListener* callback);
-bool IAP_SetupCallback(IAPListener* callback);
-bool IAP_CallbackIsValid(IAPListener* callback);
-
 char* IAP_List_CreateBuffer(lua_State* L);
 void IAP_PushError(lua_State* L, const char* error, int reason);
 void IAP_PushConstants(lua_State* L);