Merge remote-tracking branch 'upstream/master' into merge-php-code

Author: IonBazan

.travis.yml

@@ -13,6 +13,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - master
 
 before_script:

README.md

@@ -142,6 +142,10 @@ var_dump((new DateTime())->format("c")); // string(25) "2017-01-01T00:00:05+00:0
 
 ## CHANGELOG
 
+### version 1.2.10(beta), 2017/11/23
+
+- Fix "double free" bug on PHP 7.2.0 ([#32](https://github.com/hnw/php-timecop/issues/32))
+
 ### version 1.2.8(beta), 2017/7/7
 
 - Publish on PECL

circle.yml

@@ -7,7 +7,7 @@ general:
 
 dependencies:
   pre:
-    - case $CIRCLE_NODE_INDEX in 0) sudo apt-get update; sudo apt-get install php5-dev; phpenv global system ;; 1) phpenv global 5.5.36 ;; 2) phpenv global 5.6.22 ;; 3) phpenv global 7.0.11 ;; esac
+    - case $CIRCLE_NODE_INDEX in 0) sudo apt-get update; sudo apt-get install php5-dev; phpenv global system ;; 1) phpenv global 5.6.22 ;; 2) phpenv global 7.0.11 ;; 3) phpenv global 7.1.9 ;; esac
     - phpenv versions
     - phpize && ./configure && make
 

package.xml

@@ -14,17 +14,17 @@
     <email>y@hnw.jp</email>
     <active>yes</active>
   </lead>
-  <date>2017-07-07</date>
+  <date>2017-11-23</date>
   <version>
-    <release>1.2.8</release>
-    <api>1.2.8</api>
+    <release>1.2.10</release>
+    <api>1.2.10</api>
   </version>
   <stability>
     <release>beta</release>
     <api>beta</api>
   </stability>
   <license uri="https://github.com/hnw/php-timecop/blob/master/LICENSE">MIT License</license>
-  <notes>Publish on PECL
+  <notes>Fix "double free" bug on PHP 7.2.0
   </notes>
   <contents>
     <dir name="/">

timecop.h

@@ -25,7 +25,7 @@ SOFTWARE.
 #ifndef PHP_TIMECOP_H
 #define PHP_TIMECOP_H
 
-#define PHP_TIMECOP_VERSION "1.2.8"
+#define PHP_TIMECOP_VERSION "1.2.10"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -153,6 +153,24 @@ ZEND_END_MODULE_GLOBALS(timecop)
 #define TIMECOP_OCE(cname, mname) \
 	{cname, mname, OVRD_CLASS_PREFIX cname, SAVE_FUNC_PREFIX mname}
 
+/*
+ * Trick for guarding the multi-referenced internal function from function destructor on PHP 7.2.0+
+ * See: https://github.com/hnw/php-timecop/issues/29#issuecomment-332171527
+ */
+#define GUARD_FUNCTION_ARG_INFO_BEGIN(zend_func) { \
+    zend_arg_info *orig_arg_info; \
+    zend_function *zf = zend_func; \
+    if (zf->type == ZEND_INTERNAL_FUNCTION) { \
+        orig_arg_info = zf->common.arg_info; \
+        zf->common.arg_info = NULL; \
+    }
+
+#define GUARD_FUNCTION_ARG_INFO_END() \
+    if (zf->type == ZEND_INTERNAL_FUNCTION) { \
+        zf->common.arg_info = orig_arg_info; \
+    } \
+}
+
 struct timecop_override_func_entry {
 	char *orig_func;
 	char *ovrd_func;