[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/com_dotnet com_variant.c

[Ilia Alshanetsky]

iliaa           Mon Nov 13 15:33:26 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/com_dotnet     com_variant.c 
    /php-src    NEWS 
  Log:
  Fixed bug #36644 (possible crash in variant_date_from_timestamp()).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_variant.c?r1=1.11.2.2&r2=1.11.2.2.2.1&diff_format=u
Index: php-src/ext/com_dotnet/com_variant.c
diff -u php-src/ext/com_dotnet/com_variant.c:1.11.2.2 
php-src/ext/com_dotnet/com_variant.c:1.11.2.2.2.1
--- php-src/ext/com_dotnet/com_variant.c:1.11.2.2       Sat Feb  4 10:57:27 2006
+++ php-src/ext/com_dotnet/com_variant.c        Mon Nov 13 15:33:26 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: com_variant.c,v 1.11.2.2 2006/02/04 10:57:27 rrichards Exp $ */
+/* $Id: com_variant.c,v 1.11.2.2.2.1 2006/11/13 15:33:26 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -798,6 +798,11 @@
                return;
        }
 
+       if (timestamp < 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Timestamp value 
must be a positive value.");
+               RETURN_FALSE;
+       }
+
        VariantInit(&res);
        tzset();
        tmv = localtime(&timestamp);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.358&r2=1.2027.2.547.2.359&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.358 php-src/NEWS:1.2027.2.547.2.359
--- php-src/NEWS:1.2027.2.547.2.358     Sun Nov 12 17:13:22 2006
+++ php-src/NEWS        Mon Nov 13 15:33:26 2006
@@ -75,6 +75,7 @@
 - Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
   ErrorDocument). (Ilia)
 - Fixed bug #36975 (natcasesort() causes array_pop() to misbehave). (Hannes)
+- Fixed bug #36644 (possible crash in variant_date_from_timestamp()). (Ilia)
 - Fixed bug #33282 (Re-assignment by reference does not clear the is_ref flag)
   (Ilia,Dmitry, Matt Wilmas)
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php