Fix crash when non-object passed to 2nd argument of TimecopDateTime::…

…__construct() (Fix for Issue #9)
hnw · Dec 23, 2016 · 150ea43 · 150ea43
1 parent bad5ffa
commit 150ea43
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/tests/issue_009.phpt b/tests/issue_009.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Check for issue #9 (Issue with using timecop constructor)
+--SKIPIF--
+<?php
+extension_loaded('timecop') or die('skip timecop not available');
+if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+    die("skip requires PHP >= 5.3.0");
+}
+--INI--
+date.timezone=GMT
+timecop.func_override=1
+--FILE--
+<?php
+class Date extends \DateTime
+{
+    public function __construct($time='now', \DateTimeZone $timezone=null)
+    {
+        parent::__construct($time, $timezone);
+        $this->setTime(0, 0, 0);
+    }
+
+    public function __toString() {
+        return $this->format('Y-m-d');
+    }
+}
+timecop_freeze(strtotime("2010-01-01"));
+$dt1 = new Date();
+echo $dt1, "\n";
+$dt2 = new Date("2020-12-31");
+echo $dt2, "\n";
+$dt3 = new Date("2030-06-15", new \DateTimeZone("UTC"));
+echo $dt3, "\n";
+--EXPECT--
+2010-01-01
+2020-12-31
+2030-06-15
diff --git a/timecop_php5.c b/timecop_php5.c
@@ -717,7 +717,7 @@ static int fix_datetime_timestamp(zval **datetime_obj, zval *time, zval *timezon
 	 *     }
 	 * }
 	 */
-	if (timezone_obj) {
+	if (timezone_obj && Z_TYPE_P(timezone_obj) == IS_OBJECT) {
 		zval *zonename;
 		zend_call_method_with_0_params(&timezone_obj, Z_OBJCE_PP(&timezone_obj), NULL, "getname", &zonename);
 		if (zonename) {
@@ -739,7 +739,7 @@ static int fix_datetime_timestamp(zval **datetime_obj, zval *time, zval *timezon
 	 *     date_default_timezone_set($orig_zonename);
 	 * }
 	 */
-	if (timezone_obj && orig_zonename) {
+	if (timezone_obj && Z_TYPE_P(timezone_obj) == IS_OBJECT) {
 		zend_call_method_with_1_params(NULL, NULL, NULL, "date_default_timezone_set", NULL, orig_zonename);
 		zval_ptr_dtor(&orig_zonename);
 	}

diff --git a/timecop_php7.c b/timecop_php7.c
@@ -674,7 +674,7 @@ static int fix_datetime_timestamp(zval *datetime_obj, zval *time, zval *timezone
 	 *     date_default_timezone_set($zonename);
 	 * }
 	 */
-	if (timezone_obj) {
+	if (timezone_obj && Z_TYPE_P(timezone_obj) == IS_OBJECT) {
 		zval zonename;
 		zend_call_method_with_0_params(timezone_obj, Z_OBJCE_P(timezone_obj), NULL, "getname", &zonename);
 		zend_call_method_with_0_params(NULL, NULL, NULL, "date_default_timezone_get", &orig_zonename);
@@ -692,7 +692,7 @@ static int fix_datetime_timestamp(zval *datetime_obj, zval *time, zval *timezone
 	 *     date_default_timezone_set($orig_zonename);
 	 * }
 	 */
-	if (timezone_obj) {
+	if (timezone_obj && Z_TYPE_P(timezone_obj) == IS_OBJECT) {
 		zend_call_method_with_1_params(NULL, NULL, NULL, "date_default_timezone_set", NULL, &orig_zonename);
 	}
 
@@ -718,7 +718,7 @@ static int fix_datetime_timestamp(zval *datetime_obj, zval *time, zval *timezone
 	 *     date_default_timezone_set($orig_zonename);
 	 * }
 	 */
-	if (timezone_obj) {
+	if (timezone_obj && Z_TYPE_P(timezone_obj) == IS_OBJECT) {
 		zend_call_method_with_1_params(NULL, NULL, NULL, "date_default_timezone_set", NULL, &orig_zonename);
 		zval_ptr_dtor(&orig_zonename);
 	}