From af80e057962420a58e9aebdacc57ab2297e0ca76 Mon Sep 17 00:00:00 2001
From: Alexey Gulev <Alexey.Gulev@king.com>
Date: Fri, 20 Sep 2019 20:06:35 +0200
Subject: [PATCH] Fixed pcall

---
 extension-iap/src/iap_android.cpp    | 17 +++++++----------
 extension-iap/src/iap_emscripten.cpp |  4 ++--
 extension-iap/src/iap_ios.mm         |  6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/extension-iap/src/iap_android.cpp b/extension-iap/src/iap_android.cpp
index 1c3a435..54d0fac 100644
--- a/extension-iap/src/iap_android.cpp
+++ b/extension-iap/src/iap_android.cpp
@@ -14,15 +14,11 @@ struct IAP;
 #define CMD_PRODUCT_RESULT (0)
 #define CMD_PURCHASE_RESULT (1)
 
-struct DM_ALIGNED(16) Command
+struct Command
 {
-    Command()
-    {
-        memset(this, 0, sizeof(*this));
-    }
     uint32_t m_Command;
     int32_t  m_ResponseCode;
-    void*    m_Data1;
+    char*    m_Data1;
 };
 
 static dmArray<Command>    m_commandsQueue;
@@ -71,7 +67,7 @@ struct IAP
     jmethodID            m_FinishTransaction;
 };
 
-IAP g_IAP;
+static IAP g_IAP;
 
 static void add_to_queue(Command cmd)
 {
@@ -269,6 +265,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult__ILjava_lang_
     Command cmd;
     cmd.m_Command = CMD_PRODUCT_RESULT;
     cmd.m_ResponseCode = responseCode;
+    cmd.m_Data1 = 0;
     if (pl)
     {
         cmd.m_Data1 = strdup(pl);
@@ -288,7 +285,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
     Command cmd;
     cmd.m_Command = CMD_PURCHASE_RESULT;
     cmd.m_ResponseCode = responseCode;
-
+    cmd.m_Data1 = 0;
     if (pd)
     {
         cmd.m_Data1 = strdup(pd);
@@ -352,7 +349,7 @@ static void HandleProductResult(const Command* cmd)
 
     int ret = lua_pcall(L, 3, 0, 0);
     if (ret != 0) {
-        dmLogError("Error running iap callback");
+        dmLogError("Error running callback: %s", lua_tostring(L, -1));
         lua_pop(L, 1);
     }
 
@@ -425,7 +422,7 @@ static void HandlePurchaseResult(const Command* cmd)
 
     int ret = lua_pcall(L, 3, 0, 0);
     if (ret != 0) {
-        dmLogError("Error running iap callback");
+        dmLogError("Error running callback: %s", lua_tostring(L, -1));
         lua_pop(L, 1);
     }
 
diff --git a/extension-iap/src/iap_emscripten.cpp b/extension-iap/src/iap_emscripten.cpp
index 8d64c01..bf22537 100644
--- a/extension-iap/src/iap_emscripten.cpp
+++ b/extension-iap/src/iap_emscripten.cpp
@@ -101,7 +101,7 @@ void IAPList_Callback(void* Lv, const char* result_json)
 
         int ret = lua_pcall(L, 3, 0, 0);
         if (ret != 0) {
-            dmLogError("Error running iap callback");
+            dmLogError("Error running callback: %s", lua_tostring(L, -1));
             lua_pop(L, 1);
         }
         assert(top == lua_gettop(L));
@@ -199,7 +199,7 @@ void IAPListener_Callback(void* Lv, const char* result_json, int error_code)
     }
     int ret = lua_pcall(L, 3, 0, 0);
     if (ret != 0) {
-        dmLogError("Error running iap callback");
+        dmLogError("Error running callback: %s", lua_tostring(L, -1));
         lua_pop(L, 1);
     }
     assert(top == lua_gettop(L));
diff --git a/extension-iap/src/iap_ios.mm b/extension-iap/src/iap_ios.mm
index 831ca79..663ce33 100644
--- a/extension-iap/src/iap_ios.mm
+++ b/extension-iap/src/iap_ios.mm
@@ -123,7 +123,7 @@ IAP g_IAP;
 
     int ret = lua_pcall(L, 3, 0, 0);
     if (ret != 0) {
-        dmLogError("Error running iap callback");
+        dmLogError("Error running callback: %s", lua_tostring(L, -1));
         lua_pop(L, 1);
     }
 
@@ -166,7 +166,7 @@ IAP g_IAP;
 
     int ret = lua_pcall(L, 3, 0, 0);
     if (ret != 0) {
-        dmLogError("Error running iap callback");
+        dmLogError("Error running callback: %s", lua_tostring(L, -1));
         lua_pop(L, 1);
     }
 
@@ -262,7 +262,7 @@ void RunTransactionCallback(lua_State* L, int cb, int self, SKPaymentTransaction
 
     int ret = lua_pcall(L, 3, 0, 0);
     if (ret != 0) {
-        dmLogError("Error running iap callback");
+        dmLogError("Error running callback: %s", lua_tostring(L, -1));
         lua_pop(L, 1);
     }