From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 28 Jul 2004 01:44:41 +0000 (+0000)
Subject: MFH: Fixed bug #29342 (strtotime() does not handle empty date string
X-Git-Tag: php-5.0.1RC1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21f4b69b2b53b8ed25a7eca2c255bd63d0b0a645;p=php

MFH: Fixed bug #29342 (strtotime() does not handle empty date string
properly).
---

diff --git a/NEWS b/NEWS
index f085050a50..d8fc2d0c23 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
   strings). (Ilia, Tony)
 - Fixed bug #29368 (The destructor is called when an exception is thrown from 
   the constructor). (Marcus)
+- Fixed bug #29342 (strtotime() does not handle empty date string properly).
+  (Ilia)
 - Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default) (Georg)
 - Fixed bug #29291 (get_class_vars() return names with NULLs). (Marcus)
 - Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi)
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 4e455a86a0..694668198d 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -1080,8 +1080,10 @@ PHP_FUNCTION(strtotime)
 	}
 
 	convert_to_string_ex(z_time);
-	if (Z_STRLEN_PP(z_time) == 0)
-		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Called with empty time parameter");
+	if (!Z_STRLEN_PP(z_time)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Called with an empty time parameter.");
+		RETURN_LONG(-1);
+	}
 	if (argc == 2) {
 		convert_to_long_ex(z_now);
 		now = Z_LVAL_PP(z_now);