Changeset 1051

Timestamp:

01/21/11 20:04:11 (2 years ago)

Author:

msl

Message:

Fix camera crash because syntax error in ptpcam

• Author rudi
• ​http://forum.chdk-treff.de/viewtopic.php?p=20658#p20658

+ lua(r) syntax error will be shown direct in ptpcam.

+ fix in ptpcam chdkde changeset 560: ​http://my-trac.assembla.com/chdkde/changeset/560

Location:

trunk/core

Files:

• ptp.c (modified) (1 diff)
• ptp.h (modified) (1 diff)
• script.c (modified) (1 diff)

trunk/core/ptp.c

@@ -417 +417 @@
 
         free(buf);
-
-        if ( param3 & PTP_CHDK_ES_WAIT )
-        {
-
-          while ( script_is_running() )
-            msleep(100);
-
-          if ( param3 & PTP_CHDK_ES_RESULT )
+        
+        if (script_action_stack < 0)
+        {
+          ptp.code = PTP_RC_InvalidParameter;
+          break;
+        }
+        else
+        {
+
+          if ( param3 & PTP_CHDK_ES_WAIT )
           {
-            lua_State *Lt;
-            temp_data.lua_state = lua_consume_result();
-            Lt = get_lua_thread(temp_data.lua_state);
-            temp_data_kind = 2;
-            if ( lua_gettop(Lt) == 0 )
+
+            while ( script_is_running() )
+              msleep(100);
+
+            if ( param3 & PTP_CHDK_ES_RESULT )
             {
-              temp_data_extra = PTP_CHDK_TYPE_NOTHING;
-            } else if ( lua_isnil(Lt,1) )
-            {
-              temp_data_extra = PTP_CHDK_TYPE_NIL;
-            } else if ( lua_isboolean(Lt,1) )
-            {
-              temp_data_extra = PTP_CHDK_TYPE_BOOLEAN;
-            } else if ( lua_isnumber(Lt,1) )
-            {
-              temp_data_extra = PTP_CHDK_TYPE_INTEGER;
-            } else if ( lua_isstring(Lt,1) )
-            {
-              temp_data_extra = PTP_CHDK_TYPE_STRING;
-            } else {
-              temp_data_extra = PTP_CHDK_TYPE_NOTHING;
-            }
-            ptp.num_param = 1;
-            ptp.param1 = temp_data_extra;
-            if ( temp_data_extra != PTP_CHDK_TYPE_STRING )
-            {
-              if ( temp_data_extra == PTP_CHDK_TYPE_BOOLEAN )
-              {
+              lua_State *Lt;
+              temp_data.lua_state = lua_consume_result();
+              Lt = get_lua_thread(temp_data.lua_state);
+              temp_data_kind = 2;
+              if ( lua_gettop(Lt) == 0 )
+              {
+                temp_data_extra = PTP_CHDK_TYPE_NOTHING;
+              } else if ( lua_isnil(Lt,1) )
+              {
+                temp_data_extra = PTP_CHDK_TYPE_NIL;
+              } else if ( lua_isboolean(Lt,1) )
+              {
+                temp_data_extra = PTP_CHDK_TYPE_BOOLEAN;
+              } else if ( lua_isnumber(Lt,1) )
+              {
+                temp_data_extra = PTP_CHDK_TYPE_INTEGER;
+              } else if ( lua_isstring(Lt,1) )
+              {
+                temp_data_extra = PTP_CHDK_TYPE_STRING;
+              } else {
+                temp_data_extra = PTP_CHDK_TYPE_NOTHING;
+              }
+              ptp.num_param = 1;
+              ptp.param1 = temp_data_extra;
+              if ( temp_data_extra != PTP_CHDK_TYPE_STRING )
+              {
+                if ( temp_data_extra == PTP_CHDK_TYPE_BOOLEAN )
+                {
+                  ptp.num_param = 2;
+                  ptp.param2 = lua_toboolean(Lt,1);
+                } if ( temp_data_extra == PTP_CHDK_TYPE_INTEGER )
+                {
+                  ptp.num_param = 2;
+                  ptp.param2 = lua_tonumber(Lt,1);
+                }
+                lua_close(Lt);
+                temp_data_kind = 0;
+              } else {
                 ptp.num_param = 2;
-                ptp.param2 = lua_toboolean(Lt,1);
-              } if ( temp_data_extra == PTP_CHDK_TYPE_INTEGER )
-              {
-                ptp.num_param = 2;
-                ptp.param2 = lua_tonumber(Lt,1);
+                ptp.param2 = lua_objlen(Lt,1);
               }
-              lua_close(Lt);
-              temp_data_kind = 0;
-            } else {
-              ptp.num_param = 2;
-              ptp.param2 = lua_objlen(Lt,1);
             }
           }

trunk/core/ptp.h

@@ -18 +18 @@
 #define PTP_RC_GeneralError 0x2002
 #define PTP_RC_ParameterNotSupported 0x2006
+#define PTP_RC_InvalidParameter 0x201D
 
 // N.B.: unused parameters should be set to 0

trunk/core/script.c

@@ -676 +676 @@
 long script_start_ptp( char *script , int keep_result )
 {
-  lua_script_start(script);
+  if (!lua_script_start(script)) return -1;
   lua_keep_result = keep_result;
   state_lua_kbd_first_call_to_resume = 1;