release 2.0.4

fix send_zval_to_lua()

.travis.yml

@@ -1,21 +1,23 @@
 language: php 
 
+addons:
+  apt:
+    packages:
+      - liblua5.2-dev
+
 php:
-  - 5.6
+  - 7.0
-  - 5.5
-  - 5.4
-  - 5.3
-  - 5.3.3
 
-before_install:
+notifications:
-  - sudo apt-get update -qq
+  email: false
-  - sudo apt-get install -y libjson0-dev libjson0 php5-cli php5-dev  liblua5.2-dev
+  irc: "irc.efnet.org#php.yaf"
 
+env:
+  - REPORT_EXIT_STATUS=1 NO_INTERACTION=1
 
+#Compile
 before_script:
-    # Compile PHP
     - ./travis/compile.sh
 
-script: 
+# Run PHPs run-tests.php 
- - ./travis/build_check.sh
+script: TEST_PHP_ARGS="--show-diff" make test
-

README.md

@@ -1,2 +1,6 @@
-"Lua is a powerful, fast, light-weight, embeddable scripting language." 
+# PHP Lua
+[![Build Status](https://secure.travis-ci.org/laruence/php-lua.png)](https://travis-ci.org/laruence/php-lua)
+
 This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.
+
+"Lua is a powerful, fast, light-weight, embeddable scripting language." 

config.m4

@@ -3,6 +3,8 @@ PHP_ARG_WITH(lua, for lua support,
 [  --with-lua=[DIR]    Include php lua support])
 PHP_ARG_WITH(lua-version, to specify a custom lua version, [  --with-lua-version=[VERSION]]   Use the specified lua version.)
 
+PHP_ARG_WITH(lua-version, to specify a custom lua version, [  --with-lua-version=[VERSION]]   Use the specified lua version.)
+
 if test "$PHP_LUA" != "no"; then
   if test -r $PHP_LUA/include/lua.h; then
     LUA_INCLUDE_DIR=$PHP_LUA/include
@@ -15,6 +17,12 @@ if test "$PHP_LUA" != "no"; then
         break
       fi
 
+      if test -r $i/include/lua.h; then
+        LUA_INCLUDE_DIR=$i/include
+        AC_MSG_RESULT(found in $i)
+        break
+      fi
+
       if test "$PHP_LUA_VERSION" != "yes"; then
         if test -r $i/include/lua$PHP_LUA_VERSION/lua.h; then
           LUA_INCLUDE_DIR=$i/include/lua$PHP_LUA_VERSION

lua.c

@@ -174,6 +174,11 @@ static void php_lua_dtor_object(zend_object *object) /* {{{ */ {
 	php_lua_object *lua_obj = php_lua_obj_from_obj(object);
 
 	zend_object_std_dtor(&(lua_obj->obj));
+}
+/* }}} */
+
+static void php_lua_free_object(zend_object *object) /* {{{ */ {
+	php_lua_object *lua_obj = php_lua_obj_from_obj(object);
 
 	if (lua_obj->L) {
 		lua_close(lua_obj->L);
@@ -351,7 +356,7 @@ zval *php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj, zval *rv
 					break;
 				}
 
-				switch(Z_TYPE(key)) {
+				switch (Z_TYPE(key)) {
 					case IS_DOUBLE:
 					case IS_LONG:
 						add_index_zval(rv, Z_DVAL(key), &val);
@@ -401,11 +406,15 @@ zval *php_lua_get_zval_from_lua(lua_State *L, int index, zval *lua_obj, zval *rv
 
 int php_lua_send_zval_to_lua(lua_State *L, zval *val) /* {{{ */ {
 
+try_again:
 	switch (Z_TYPE_P(val)) {
 		case IS_TRUE:
-		case IS_FALSE:
+			lua_pushboolean(L, 1);
-			lua_pushboolean(L, Z_LVAL_P(val));
 			break;
+		case IS_FALSE:
+			lua_pushboolean(L, 0);
+			break;
+		case IS_UNDEF:
 		case IS_NULL:
 			lua_pushnil(L);
 			break;
@@ -437,32 +446,46 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val) /* {{{ */ {
 					add_next_index_zval(callbacks, val);
 				} else {
 					zval *v;
+					ulong longkey;
 					zend_string *key;
 					zval zkey;
 
 					HashTable *ht = HASH_OF(val);
-					if (++ht->u.v.nApplyCount > 1) {
+					if (ZEND_HASH_APPLY_PROTECTION(ht)) {
+						ZEND_HASH_INC_APPLY_COUNT(ht);
+						if (ZEND_HASH_GET_APPLY_COUNT(ht) > 1) {
 							php_error_docref(NULL, E_ERROR, "recursion found");
-						--ht->u.v.nApplyCount;
+							ZEND_HASH_DEC_APPLY_COUNT(ht);
 							break;
 						}
+					}
+
 					lua_newtable(L);
 
-					ZEND_HASH_FOREACH_STR_KEY_VAL(ht, key, v) {
+					ZEND_HASH_FOREACH_KEY_VAL_IND(ht, longkey, key, v) {
-						if (Z_TYPE_P(v) == IS_STRING) {
+						if (key) {
 							ZVAL_STR(&zkey, key);
-						}
+						} else {
-						if (Z_TYPE_P(v) == IS_LONG) {
+							ZVAL_LONG(&zkey, longkey);
-							ZVAL_LONG(&zkey, Z_LVAL_P(v));
 						}
 						php_lua_send_zval_to_lua(L, &zkey);
 						php_lua_send_zval_to_lua(L, v);
 						lua_settable(L, -3);
 					} ZEND_HASH_FOREACH_END();
 
-					--ht->u.v.nApplyCount;
+					if (ZEND_HASH_APPLY_PROTECTION(ht)) {
+						ZEND_HASH_DEC_APPLY_COUNT(ht);
 					}
 				}
+			}
+			break;
+		case IS_REFERENCE:
+			ZVAL_DEREF(val);
+			goto try_again;
+			break;
+		case IS_INDIRECT:
+			val = Z_INDIRECT_P(val);
+			goto try_again;
 			break;
 		default:
 			php_error_docref(NULL, E_ERROR, "unsupported type `%s' for lua", zend_zval_type_name(val));
@@ -813,7 +836,7 @@ PHP_MINIT_FUNCTION(lua) {
 	memcpy(&lua_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	lua_object_handlers.offset = XtOffsetOf(php_lua_object, obj);
 	lua_object_handlers.dtor_obj = php_lua_dtor_object;
-	lua_object_handlers.free_obj = NULL;
+	lua_object_handlers.free_obj = php_lua_free_object;
 	lua_object_handlers.clone_obj = NULL;
 	lua_object_handlers.write_property = php_lua_write_property;
 	lua_object_handlers.read_property  = php_lua_read_property;

package.xml

@@ -23,25 +23,19 @@
   <email>msaraujo@php.net</email>
   <active>yes</active>
  </developer>
- <developer>
+ <date>2017-07-12</date>
-  <name>Helmut Januschka</name>
+ <time>19:15:00</time>
-  <user>hjanuschka</user>
-  <email>helmut@januschka.com</email>
-  <active>yes</active>
- </developer>
- <date>2015-10-27</date>
- <time>11:12:27</time>
  <version>
-  <release>2.0.0</release>
+  <release>2.0.4</release>
-  <api>2.0.0</api>
+  <api>2.0.4</api>
  </version>
  <stability>
-  <release>beta</release>
+  <release>stable</release>
-  <api>beta</api>
+  <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
-  - Release lua for PHP7
+  - Fixed bug #73964 (Segmentation fault)
  </notes>
  <contents> 
   <dir name="/"> 
@@ -68,7 +62,10 @@
     <file name="011.phpt" role="test" />
     <file name="012.phpt" role="test" />
     <file name="013.phpt" role="test" />
+    <file name="issue012.phpt" role="test" />
     <file name="bug65097.phpt" role="test" />
+    <file name="bug71997.phpt" role="test" />
+    <file name="bug73964.phpt" role="test" />
    </dir>
   </dir> 
  </contents> 
@@ -85,6 +82,68 @@
  <providesextension>lua</providesextension>
  <extsrcrelease />
  <changelog> 
+  <release> 
+   <date>2017-02-10</date> 
+   <version> 
+    <release>2.0.3</release> 
+    <api>2.0.3</api> 
+   </version> 
+   <stability> 
+    <release>stable</release> 
+    <api>stable</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed issue #20 (PHP 7: Lua::eval(): unsupported type `unknown' for lua)
+   </notes> 
+  </release> 
+
+  <release> 
+   <date>2017-07-12</date> 
+   <version> 
+    <release>2.0.4</release> 
+    <api>2.0.4</api> 
+   </version> 
+   <stability> 
+    <release>stable</release> 
+    <api>stable</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed bug #73964 (Segmentation fault)
+   </notes> 
+  </release> 
+
+  <release> 
+   <date>2016-05-26</date> 
+   <version> 
+    <release>2.0.2</release> 
+    <api>2.0.2</api> 
+   </version> 
+   <stability> 
+    <release>stable</release> 
+    <api>stable</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed issue #22 (Boolean FALSE is always TRUE)
+   </notes> 
+  </release> 
+  <release> 
+   <date>2016-04-11</date> 
+   <version> 
+    <release>2.0.1</release> 
+    <api>2.0.1</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed bug #71997 (One-Dimensional arrays cause segmentation faults)
+   </notes> 
+  </release> 
   <release> 
    <date>2015-10-27</date> 
    <version> 
@@ -100,7 +159,6 @@
     - Release lua for PHP7
    </notes> 
   </release> 
-
   <release> 
    <date>2012-10-23</date> 
    <version> 

php_lua.h

@@ -48,7 +48,7 @@ extern zend_module_entry lua_module_entry;
 #define LUA_G(v) (lua_globals.v)
 #endif
 
-#define PHP_LUA_VERSION "2.0.0"
+#define PHP_LUA_VERSION "2.0.4"
 
 struct _php_lua_object {
   lua_State *L;

tests/bug71997.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Bug #71997 (One-Dimensional arrays cause segmentation faults)
+--SKIPIF--
+<?php
+if (!extension_loaded("lua")) print "skip lua extension missing";
+?>
+--FILE--
+<?php
+$mylua = new \lua();
+$mylua->eval(<<<CODE
+    function nicefunction(args)
+        print(args[1])
+        return args[1]
+    end
+CODE
+);
+
+echo $mylua->call("nicefunction", array(array('hello', 'world')));
+?>
+done
+--EXPECT--
+worldworlddone

tests/bug73964.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Bug #73964 (Segmentation fault (11))
+--SKIPIF--
+<?php
+if (!extension_loaded("lua")) print "skip lua extension missing";
+?>
+--FILE--
+<?php
+
+class LuaTest
+{
+	function __construct()
+	{ 
+		$this->lua = new Lua();
+		$this->lua->registerCallback("log", array($this, "API_LuaLog"));   
+	}
+
+
+	function API_LuaLog( $entry)
+	{
+		echo("from lua: $entry");
+	}   
+
+	public function RunTest()
+	{
+		$this->lua->eval(<<<CODE
+function TestFunc(str)
+	 log(str)
+
+end
+
+CODE
+	);               
+		$GamePackage = $this->lua->RootTable;
+
+		$this->lua->call("TestFunc", array("okey"));
+	}
+}
+
+
+$a = new LuaTest();
+$a->runtest();
+?>
+--EXPECT--
+from lua: okey

tests/issue012.phpt

@@ -0,0 +1,15 @@
+--TEST--
+ISSUE #022 (Boolean FALSE is always TRUE)
+--SKIPIF--
+<?php
+if (!extension_loaded("lua")) print "skip lua extension missing";
+?>
+--FILE--
+<?php
+$lua = new Lua();
+$lua->assign('TEST', false);
+$result = $lua->eval('return TEST');
+var_dump($result)
+?>
+--EXPECT--
+bool(false)

travis/compile.sh

@@ -1,14 +1,2 @@
-phpize
+#!/bin/sh
-
+phpize && ./configure --with-lua-version=5.2 && make 
-./configure  --with-lua-version=5.2
-make
-EX=$?;
-if [ $EX != 0 ];
-then
-	echo "compile failed";
-	exit $EX;
-fi;
-
-
-
-exit $EX;