date:20100702

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/spl/spl_iterators.c branches/PHP_5_2/ext/spl/tests/bug52238.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_iterators.c

2010-07-02 Thread Johannes Schlüter

johannes Fri, 02 Jul 2010 19:17:45 +

Revision: http://svn.php.net/viewvc?view=revision&revision=300951

Log:
Fix bug #52238: Crash when an Exception occured in iterator_to_array

Bug: http://bugs.php.net/52238 (Open) Crash when an Exception occured in 
iterator_to_array
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c
A   php/php-src/branches/PHP_5_2/ext/spl/tests/bug52238.phpt
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c
A   php/php-src/branches/PHP_5_3/ext/spl/tests/bug52238.phpt
U   php/php-src/trunk/ext/spl/spl_iterators.c
A   php/php-src/trunk/ext/spl/tests/bug52238.phpt

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-07-02 19:16:21 UTC (rev 300950)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-07-02 19:17:45 UTC (rev 300951)
@@ -2,6 +2,9 @@
 |||
 ?? Jul 2010, PHP 5.2.14

+- Fixed bug #52238 (Crash when an Exception occured in iterator_to_array).
+  (Johannes)
+
 01 Jul 2010, PHP 5.2.14RC2
 - Fixed a possible interruption array leak in strrchr(). Reported by
   Péter Veres. (CVE-2010-2484) (Felipe)

Modified: php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c
===
--- php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c2010-07-02 
19:16:21 UTC (rev 300950)
+++ php/php-src/branches/PHP_5_2/ext/spl/spl_iterators.c2010-07-02 
19:17:45 UTC (rev 300951)
@@ -2701,7 +2701,9 @@
}

 done:
-   iter->funcs->dtor(iter TSRMLS_CC);
+   if (iter) {
+   iter->funcs->dtor(iter TSRMLS_CC);
+   }
return EG(exception) ? FAILURE : SUCCESS;
 }
 /* }}} */

Added: php/php-src/branches/PHP_5_2/ext/spl/tests/bug52238.phpt
===
--- php/php-src/branches/PHP_5_2/ext/spl/tests/bug52238.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/spl/tests/bug52238.phpt2010-07-02 
19:17:45 UTC (rev 300951)
@@ -0,0 +1,24 @@
+--TEST--
+Bug #52238 - Crash when an Exception occured in iterator_to_array
+--FILE--
+bar());
+}
+}
+var_dump(iterator_to_array(new Foo));
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'Exception' in %s
+Stack trace:
+#0 %s: Foo->bar()
+#1 [internal function]: Foo->getIterator()
+#2 %s: iterator_to_array(Object(Foo))
+#3 {main}
+  thrown in %s on line %d


Property changes on: php/php-src/branches/PHP_5_2/ext/spl/tests/bug52238.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-07-02 19:16:21 UTC (rev 300950)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-07-02 19:17:45 UTC (rev 300951)
@@ -2,6 +2,8 @@
 |||
 ?? Jul 2010, PHP 5.3.3 RC3

+- Fixed bug #52238 (Crash when an Exception occured in iterator_to_array).
+  (Johannes)

 01 Jul 2010, PHP 5.3.3 RC2
 - Fixed SplObjectStorage unserialization problems (CVE-2010-2225). (Stas)

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c2010-07-02 
19:16:21 UTC (rev 300950)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_iterators.c2010-07-02 
19:17:45 UTC (rev 300951)
@@ -3035,7 +3035,9 @@
}

 done:
-   iter->funcs->dtor(iter TSRMLS_CC);
+   if (iter) {
+   iter->funcs->dtor(iter TSRMLS_CC);
+   }
return EG(exception) ? FAILURE : SUCCESS;
 }
 /* }}} */

Added: php/php-src/branches/PHP_5_3/ext/spl/tests/bug52238.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug52238.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug52238.phpt2010-07-02 
19:17:45 UTC (rev 300951)
@@ -0,0 +1,24 @@
+--TEST--
+Bug #52238 - Crash when an Exception occured in iterator_to_array
+--FILE--
+bar());
+}
+}
+var_dump(iterator_to_array(new Foo));
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'Exception' in %s
+Stack trace:
+#0 %s: Foo->bar()
+#1 [internal function]: Foo->getIterator()
+#2 %s: iterator_to_array(Object(Foo))
+#3 {main}
+  thrown in %s on line %d


Property changes on: php/php-src/branches/PHP_5_3/ext/spl/tests/bug52238.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/ph

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

2010-07-02 Thread Felipe Pena

felipe   Fri, 02 Jul 2010 19:16:21 +

Revision: http://svn.php.net/viewvc?view=revision&revision=300950

Log:
- Added CVE id

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-07-02 19:12:51 UTC (rev 300949)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-07-02 19:16:21 UTC (rev 300950)
@@ -4,7 +4,7 @@

 01 Jul 2010, PHP 5.2.14RC2
 - Fixed a possible interruption array leak in strrchr(). Reported by
-  Péter Veres. (Felipe)
+  Péter Veres. (CVE-2010-2484) (Felipe)
 - Fixed a possible interruption array leak in strchr(), strstr(), substr(),
   chunk_split(), strtok(), addcslashes(), str_repeat(), trim(). (Felipe)
 - Fixed a possible memory corruption in substr_replace() (Dmitry)

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

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/pcre/pcrelib/ChangeLog ext/pcre/pcrelib/NEWS ext/pcre/pcrelib/NON-UNIX-USE ext/pcre/pcrelib/config.h ext/pcre/pcrelib/doc/pcre.txt ext/pcre/pcrelib/pcre.h e

2010-07-02 Thread Ilia Alshanetsky

iliaaFri, 02 Jul 2010 17:17:16 +

Revision: http://svn.php.net/viewvc?view=revision&revision=300946

Log:
Upgraded bundled PCRE to version 8.10

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/pcre/pcrelib/ChangeLog
U   php/php-src/trunk/ext/pcre/pcrelib/NEWS
U   php/php-src/trunk/ext/pcre/pcrelib/NON-UNIX-USE
U   php/php-src/trunk/ext/pcre/pcrelib/config.h
U   php/php-src/trunk/ext/pcre/pcrelib/doc/pcre.txt
U   php/php-src/trunk/ext/pcre/pcrelib/pcre.h
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_chartables.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_compile.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_exec.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_printint.src
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_study.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_tables.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcre_xclass.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcreposix.c
U   php/php-src/trunk/ext/pcre/pcrelib/pcreposix.h
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput10
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput2
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput5
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput6
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput9
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testoutput10
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testoutput2
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testoutput5
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testoutput6
U   php/php-src/trunk/ext/pcre/pcrelib/testdata/testoutput9


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS configure.in main/php_version.h

2010-07-02 Thread Johannes Schlüter

johannes Fri, 02 Jul 2010 07:32:05 +

Revision: http://svn.php.net/viewvc?view=revision&revision=300935

Log:
Back to -dev

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/branches/PHP_5_3/main/php_version.h

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-07-02 07:30:04 UTC (rev 300934)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-07-02 07:32:05 UTC (rev 300935)
@@ -1,5 +1,8 @@
 PHPNEWS
 |||
+?? Jul 2010, PHP 5.3.3 RC3
+
+
 01 Jul 2010, PHP 5.3.3 RC2
 - Fixed SplObjectStorage unserialization problems (CVE-2010-2225). (Stas)


Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2010-07-02 07:30:04 UTC (rev 
300934)
+++ php/php-src/branches/PHP_5_3/configure.in   2010-07-02 07:32:05 UTC (rev 
300935)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=3
-PHP_EXTRA_VERSION="RC2"
+PHP_EXTRA_VERSION="RC3-dev"
 
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


Modified: php/php-src/branches/PHP_5_3/main/php_version.h
===
--- php/php-src/branches/PHP_5_3/main/php_version.h 2010-07-02 07:30:04 UTC 
(rev 300934)
+++ php/php-src/branches/PHP_5_3/main/php_version.h 2010-07-02 07:32:05 UTC 
(rev 300935)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 3
-#define PHP_EXTRA_VERSION "RC2"
-#define PHP_VERSION "5.3.3RC2"
+#define PHP_EXTRA_VERSION "RC3-dev"
+#define PHP_VERSION "5.3.3RC3-dev"
 #define PHP_VERSION_ID 50303

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/spl/spl_iterators.c branches/PHP_5_2/ext/spl/tests/bug52238.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_iterators.c

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/pcre/pcrelib/ChangeLog ext/pcre/pcrelib/NEWS ext/pcre/pcrelib/NON-UNIX-USE ext/pcre/pcrelib/config.h ext/pcre/pcrelib/doc/pcre.txt ext/pcre/pcrelib/pcre.h e

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS configure.in main/php_version.h

4 matches

Site Navigation

Mail list logo

Footer information