Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867
Please revert. On Thu, Dec 9, 2010 at 3:00 PM, Moriyoshi Koizumi wrote: > Hey, I don't think there was agreement on this yet. I've actually > been preparing a patch that minimizes the extra hook points in SAPI. > > Moriyoshi > > On Wed, Dec 8, 2010 at 8:27 PM, Dmitry Stogov wrote: >> dmitry Wed, 08 Dec 2010 11:27:34 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=306077 >> >> Log: >> Removed compile time dependency from ext/mbstring >> >> Changed paths: >> U php/php-src/trunk/NEWS >> U php/php-src/trunk/Zend/zend_compile.c >> U php/php-src/trunk/Zend/zend_globals.h >> U php/php-src/trunk/Zend/zend_multibyte.c >> U php/php-src/trunk/Zend/zend_multibyte.h >> U php/php-src/trunk/ext/exif/exif.c >> U php/php-src/trunk/ext/mbstring/mbstring.c >> U php/php-src/trunk/ext/standard/html.c >> U php/php-src/trunk/main/rfc1867.c >> U php/php-src/trunk/main/rfc1867.h >> A php/php-src/trunk/tests/basic/028.phpt >> A php/php-src/trunk/tests/basic/029.phpt >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867
Hey, I don't think there was agreement on this yet. I've actually been preparing a patch that minimizes the extra hook points in SAPI. Moriyoshi On Wed, Dec 8, 2010 at 8:27 PM, Dmitry Stogov wrote: > dmitry Wed, 08 Dec 2010 11:27:34 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=306077 > > Log: > Removed compile time dependency from ext/mbstring > > Changed paths: > U php/php-src/trunk/NEWS > U php/php-src/trunk/Zend/zend_compile.c > U php/php-src/trunk/Zend/zend_globals.h > U php/php-src/trunk/Zend/zend_multibyte.c > U php/php-src/trunk/Zend/zend_multibyte.h > U php/php-src/trunk/ext/exif/exif.c > U php/php-src/trunk/ext/mbstring/mbstring.c > U php/php-src/trunk/ext/standard/html.c > U php/php-src/trunk/main/rfc1867.c > U php/php-src/trunk/main/rfc1867.h > A php/php-src/trunk/tests/basic/028.phpt > A php/php-src/trunk/tests/basic/029.phpt > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- 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
aharvey Thu, 09 Dec 2010 02:47:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=306105 Log: Fix the next version number in NEWS. 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-12-09 00:18:40 UTC (rev 306104) +++ php/php-src/branches/PHP_5_2/NEWS 2010-12-09 02:47:47 UTC (rev 306105) @@ -1,6 +1,6 @@ PHP NEWS ||| -?? ?? , PHP 5.2.15 +?? ?? , PHP 5.2.16 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using -- 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
johannes Wed, 08 Dec 2010 22:48:36 + Revision: http://svn.php.net/viewvc?view=revision&revision=306102 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-12-08 22:35:50 UTC (rev 306101) +++ php/php-src/branches/PHP_5_3/NEWS 2010-12-08 22:48:36 UTC (rev 306102) @@ -1,5 +1,7 @@ PHP NEWS ||| +?? ??? 20??, PHP 5.3.5 + 09 Dec 2010, PHP 5.3.4 - Upgraded bundled Sqlite3 to version 3.7.3. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2010-12-08 22:35:50 UTC (rev 306101) +++ php/php-src/branches/PHP_5_3/configure.in 2010-12-08 22:48:36 UTC (rev 306102) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=4 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=5 +PHP_EXTRA_VERSION="-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-12-08 22:35:50 UTC (rev 306101) +++ php/php-src/branches/PHP_5_3/main/php_version.h 2010-12-08 22:48:36 UTC (rev 306102) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.3.4" -#define PHP_VERSION_ID 50304 +#define PHP_RELEASE_VERSION 5 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.3.5-dev" +#define PHP_VERSION_ID 50305 -- 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 configure.in main/php_version.h
iliaaWed, 08 Dec 2010 22:33:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=306100 Log: Back to dev, one final time ;-) Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-12-08 22:31:09 UTC (rev 306099) +++ php/php-src/branches/PHP_5_2/NEWS 2010-12-08 22:33:02 UTC (rev 306100) @@ -1,5 +1,7 @@ PHP NEWS ||| +?? ?? , PHP 5.2.15 + 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE. (jorto at redhat dot com) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-12-08 22:31:09 UTC (rev 306099) +++ php/php-src/branches/PHP_5_2/configure.in 2010-12-08 22:33:02 UTC (rev 306100) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=15 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=16 +PHP_EXTRA_VERSION="-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_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-08 22:31:09 UTC (rev 306099) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-08 22:33:02 UTC (rev 306100) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 15 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.15" -#define PHP_VERSION_ID 50215 +#define PHP_RELEASE_VERSION 16 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.16-dev" +#define PHP_VERSION_ID 50216 -- 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/ configure.in main/php_version.h
iliaaWed, 08 Dec 2010 22:30:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=306098 Log: 5.2.15 Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-12-08 22:30:12 UTC (rev 306097) +++ php/php-src/branches/PHP_5_2/configure.in 2010-12-08 22:30:48 UTC (rev 306098) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=15 -PHP_EXTRA_VERSION="RC3-dev" +PHP_EXTRA_VERSION="" 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_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-08 22:30:12 UTC (rev 306097) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-08 22:30:48 UTC (rev 306098) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 15 -#define PHP_EXTRA_VERSION "RC3-dev" -#define PHP_VERSION "5.2.15RC3-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.2.15" #define PHP_VERSION_ID 50215 -- 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 ext/gd/gd.c
iliaaWed, 08 Dec 2010 22:30:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306097
Log:
Fixed bug #53492 (fix crash if anti-aliasing steps are invalid).
Bug: http://bugs.php.net/53492 (Closed) Stack buffer overflow in imagepstext
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/gd/gd.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-12-08 22:07:40 UTC (rev 306096)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-12-08 22:30:12 UTC (rev 306097)
@@ -1,21 +1,18 @@
PHP
NEWS
|||
-?? ??? 2010, PHP 5.2.15
-
-02 Dec 2010, PHP 5.2.15RC2
+09 Dec 2010, PHP 5.2.15
- Fixed extract() to do not overwrite $GLOBALS and $this when using
- EXTR_OVERWRITE. (jorto at redhat dot com)
-
-18 Nov 2010, PHP 5.2.15RC1
+ EXTR_OVERWRITE. (jorto at redhat dot com)
- Fixed crash in zip extract method (possible CWE-170).
(Maksymilian Arciemowicz, Pierre)
- Fixed a possible double free in imap extension (Identified by Mateusz
Kocielski). (CVE-2010-4150). (Ilia)
- Fixed possible flaw in open_basedir (CVE-2010-3436). (Pierre)
- Fixed possible crash in mssql_fetch_batch(). (Kalle)
-
- Fixed NULL pointer dereference in ZipArchive::getArchiveComment.
(CVE-2010-3709). (Maksymilian Arciemowicz)
+
+- Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
- Fixed bug #53323 (pdo_firebird getAttribute() crash).
(preeves at ibphoenix dot com)
- Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with
Modified: php/php-src/branches/PHP_5_2/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_2/ext/gd/gd.c2010-12-08 22:07:40 UTC (rev
306096)
+++ php/php-src/branches/PHP_5_2/ext/gd/gd.c2010-12-08 22:30:12 UTC (rev
306097)
@@ -4593,6 +4593,11 @@
return;
}
+ if (aa_steps != 4 || aa_steps != 16) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4
or 16");
+ RETURN_FALSE;
+ }
+
ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
--
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/ext/mysqlnd/ mysqlnd_ps.c
andrey Wed, 08 Dec 2010 21:55:29 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306095
Log:
enable again after 5.3.4 has already been tagged
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2010-12-08
21:47:12 UTC (rev 306094)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2010-12-08
21:55:29 UTC (rev 306095)
@@ -561,8 +561,7 @@
}
}
}
-/* #ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET */
-#if A0
+#ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET
if (stmt->upsert_status.server_status & SERVER_PS_OUT_PARAMS) {
s->m->free_stmt_content(s TSRMLS_CC);
DBG_INF("PS OUT Variable RSet, skipping");
--
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
johannes Wed, 08 Dec 2010 21:38:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=306090 Log: PHP 5.3.4 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-12-08 21:32:00 UTC (rev 306089) +++ php/php-src/branches/PHP_5_3/NEWS 2010-12-08 21:38:51 UTC (rev 306090) @@ -1,65 +1,6 @@ PHPNEWS ||| -?? Dec 2010, PHP 5.3.4 -- SQLite3 extension: - . Fixed bug #53463 (sqlite3 columnName() segfaults on bad column_number). -(Felipe) - -02 Dec 2010, PHP 5.3.4RC2 -- Core: - . Fixed extract() to do not overwrite $GLOBALS and $this when using -EXTR_OVERWRITE. (jorto at redhat dot com) - . Fixed bug #53304 (quot_print_decode does not handle lower-case hex digits). -(Ilia, daniel dot mueller at inexio dot net) - . Fixed bug #52327 (base64_decode() improper handling of leading padding in -strict mode). (Ilia) - . Fixed bug #47168 (printf of floating point variable prints maximum of 40 -decimal places). (Ilia) - . Fixed bug #46587 (mt_rand() does not check that max is greater than min). -(Ilia) - . Fixed #53409 (sleep() returns NULL on Windows). (Pierre) - . Fixed #29085 (bad default include_path on Windows). (Pierre) - -- cURL extension: - . Fixed bug #52828 (curl_setopt does not accept persistent streams). -(Gustavo, Ilia) - . Fixed bug #52202 (CURLOPT_PRIVATE gets corrupted). (Ilia) - . Fixed bug #50410 (curl extension slows down PHP on Windows). (Pierre) - -- DBA extension: - . Added Berkeley DB 5.1 support to the DBA extension. (Oracle Corp.) - -- DOM extension: - . Fixed bug #52656 (DOMCdataSection does not work with splitText). (Ilia) - -- Hash extension: - . Fixed bug #51003 (unaligned memory access in ext/hash/hash_tiger.c). -(Mike, Ilia) - -- Iconv extension: - . Fixed bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded -words). (Ilia) - -- Intl extension: - . Fixed crashes on invalid parameters in intl extension. (CVE-2010-4409). (Stas, Maksymilian -Arciemowicz) - . Added support for formatting the timestamp stored in a DateTime object. -(Stas) - -- Phar extension: - . Fixed bug #50987 (unaligned memory access in phar.c). -(geissert at debian dot org, Ilia) - -- Reflection extension: - . Fixed bug #53366 (Reflection doesnt get dynamic property value from -getProperty()). (Felipe) - . Fixed bug #52854 (ReflectionClass::newInstanceArgs does not work for classes -without constructors). (Johannes) - -- SPL extension: - . Fixed bug #53362 (Segmentation fault when extending SplFixedArray). (Felipe) - -18 Nov 2010, PHP 5.3.4RC1 +09 Dec 2010, PHP 5.3.4 - Upgraded bundled Sqlite3 to version 3.7.3. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) @@ -109,12 +50,17 @@ (andrei dot nigmatulin at gmail dot com, fat) - Core: + . Fixed extract() to do not overwrite $GLOBALS and $this when using +EXTR_OVERWRITE. (jorto at redhat dot com) . Fixed bug in the Windows implementation of dns_get_record, where the two last parameters wouldn't be filled unless the type were DNS_ANY (Gustavo). . Changed the $context parameter on copy() to actually have an effect. (Kalle) . Fixed htmlentities/htmlspecialchars accepting certain ill-formed UTF-8 sequences. (Gustavo) - . Fixed Bug #53319 (strip_tags() may strip '' incorrectly). (Felipe) + . Fixed bug #53409 (sleep() returns NULL on Windows). (Pierre) + . Fixed bug #53319 (strip_tags() may strip '' incorrectly). (Felipe) + . Fixed bug #53304 (quot_print_decode does not handle lower-case hex digits). +(Ilia, daniel dot mueller at inexio dot net) . Fixed bug #53248 (rawurlencode RFC 3986 EBCDIC support misses tilde char). (Justin Martin) . Fixed bug #53226 (file_exists fails on big filenames). (Adam) @@ -135,6 +81,8 @@ . Fixed bug #52772 (var_dump() doesn't check for the existence of get_class_name before calling it). (Kalle, Gustavo) . Fixed bug #52534 (var_export array with negative key). (Felipe) + . Fixed bug #52327 (base64_decode() improper handling of leading padding in +strict mode). (Ilia) . Fixed bug #52260 (dns_get_record fails with non-existing domain on Windows). (a_jelly_doughnut at phpbb dot com, Pierre) . Fixed bug #50953 (socket will not connect to IPv4 address when the host has @@ -148,6 +96,11 @@ Pierre) . Fixed bug #47643 (array_diff() takes over 3000 times longer than php 5.2.4). (Felipe) + . Fixed bug #47168 (printf of floating point variable prints maximum of 40 +decimal places). (Ilia) + . Fixed bug #46587 (mt_rand() do
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_multibyte.c
dmitry Wed, 08 Dec 2010 14:49:26 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306081
Log:
Fixed startup errors if ext/exif is loaded without ext/mbstring
Changed paths:
U php/php-src/trunk/Zend/zend_multibyte.c
Modified: php/php-src/trunk/Zend/zend_multibyte.c
===
--- php/php-src/trunk/Zend/zend_multibyte.c 2010-12-08 14:16:17 UTC (rev
306080)
+++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-08 14:49:26 UTC (rev
306081)
@@ -530,7 +530,8 @@
static int dummy_encoding_list_checker(const char *encoding_list TSRMLS_DC)
{
- return 0;
+ /* ignore encoding */
+ return 1;
}
static const char* dummy_get_internal_encoding(TSRMLS_D)
--
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/ext/curl/tests/curl_multi_getcontent_basic3.phpt branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt branches/PHP_5_2/ext/curl/tests/curl_mu
eyaltWed, 08 Dec 2010 14:16:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=306080 Log: curl_setopt() arg: using DIRECTORY_SEPARATOR rather then "/" to make windows tests pass too Changed paths: U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error4.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error1.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error2.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error3.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error4.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error1.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error2.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error3.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error4.phpt Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2010-12-08 14:12:30 UTC (rev 306079) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2010-12-08 14:16:17 UTC (rev 306080) @@ -17,7 +17,7 @@ //SET URL AND OTHER OPTIONS curl_setopt($ch1, CURLOPT_URL, "http://php.net/robots.txt";); - curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt"); + curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); @@ -55,5 +55,10 @@ Disallow: /search.php Disallow: /mod.php Disallow: /manual/add-note.php + +Disallow: /harming/humans +Disallow: /ignoring/human/orders +Disallow: /harm/to/self + CURL2 Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt 2010-12-08 14:12:30 UTC (rev 306079) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt 2010-12-08 14:16:17 UTC (rev 306080) @@ -16,8 +16,8 @@ $ch2=curl_init(); //SET URL AND OTHER OPTIONS - curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt"); - curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt"); + curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata1.txt"); + curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt 2010-12-08 14:12:30 UTC (rev 306079) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt 2010-12-08 14:16:17 UTC (rev 306080) @@ -16,8 +16,8 @@ $ch2=curl_init(); //SET URL AND OTHER OPTIONS - curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt"); - curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt"); + curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata1.txt"); + curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt 2010-12-08 14:12:30 UTC (rev 306079) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt 2010-12-08 14:16:17 UTC (rev 306080) @@ -16,8 +16,8 @@ $ch2=curl_init(); //SET URL AND OTHER OPTIONS - curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt"); - curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/gd/gd.c trunk/ext/gd/gd.c
oh right, should be fixed there too. I will merge the fix once I'm
back home. Thanks for the head up
On Wed, Dec 8, 2010 at 1:26 PM, Ilia Alshanetsky wrote:
> What about 5.2?
>
> On Wed, Dec 8, 2010 at 3:45 AM, Pierre Joye wrote:
>> pajoye Wed, 08 Dec 2010 08:45:56 +
>>
>> Revision: http://svn.php.net/viewvc?view=revision&revision=306075
>>
>> Log:
>> - Fix #53492, fix crash if aa steps are invalid
>>
>> Bug: http://bugs.php.net/53492 (Assigned) Stack buffer overflow in
>> imagepstext
>>
>> Changed paths:
>> U php/php-src/branches/PHP_5_3/NEWS
>> U php/php-src/branches/PHP_5_3/ext/gd/gd.c
>> U php/php-src/trunk/ext/gd/gd.c
>>
>> Modified: php/php-src/branches/PHP_5_3/NEWS
>> ===
>> --- php/php-src/branches/PHP_5_3/NEWS 2010-12-08 08:20:44 UTC (rev 306074)
>> +++ php/php-src/branches/PHP_5_3/NEWS 2010-12-08 08:45:56 UTC (rev 306075)
>> @@ -207,7 +207,10 @@
>> and trailing :: in the filter extension). (Gustavo)
>> . Fixed bug #50117 (problems in the validation of IPv6 addresses with IPv4
>> addresses and ::). (Gustavo)
>> -
>> +
>> +- GD extension:
>> + . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid).
>> (Pierre)
>> +
>> - GMP extension:
>> . Fixed bug #52906 (gmp_mod returns negative result when non-negative is
>> expected). (Stas)
>>
>> Modified: php/php-src/branches/PHP_5_3/ext/gd/gd.c
>> ===
>> --- php/php-src/branches/PHP_5_3/ext/gd/gd.c 2010-12-08 08:20:44 UTC (rev
>> 306074)
>> +++ php/php-src/branches/PHP_5_3/ext/gd/gd.c 2010-12-08 08:45:56 UTC (rev
>> 306075)
>> @@ -4228,6 +4228,11 @@
>> return;
>> }
>>
>> + if (aa_steps != 4 || aa_steps != 16) {
>> + php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must
>> be 4 or 16");
>> + RETURN_FALSE;
>> + }
>> +
>> ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
>> ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font",
>> le_ps_font);
>>
>>
>> Modified: php/php-src/trunk/ext/gd/gd.c
>> ===
>> --- php/php-src/trunk/ext/gd/gd.c 2010-12-08 08:20:44 UTC (rev 306074)
>> +++ php/php-src/trunk/ext/gd/gd.c 2010-12-08 08:45:56 UTC (rev 306075)
>> @@ -4290,6 +4290,11 @@
>> return;
>> }
>>
>> + if (aa_steps != 4 || aa_steps != 16) {
>> + php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must
>> be 4 or 16");
>> + RETURN_FALSE;
>> + }
>> +
>> ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
>> ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font",
>> le_ps_font);
>>
>>
>>
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/exif/ exif.c
tony2001 Wed, 08 Dec 2010 12:35:25 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306078
Log:
fix ZTS build
Changed paths:
U php/php-src/trunk/ext/exif/exif.c
Modified: php/php-src/trunk/ext/exif/exif.c
===
--- php/php-src/trunk/ext/exif/exif.c 2010-12-08 11:27:34 UTC (rev 306077)
+++ php/php-src/trunk/ext/exif/exif.c 2010-12-08 12:35:25 UTC (rev 306078)
@@ -2648,7 +2648,7 @@
ByteCount,
ImageInfo->encode_unicode,
decode
- TSRMLS_DC) != 0) {
+ TSRMLS_CC) != 0) {
len = exif_process_string_raw(pszInfoPtr,
szValuePtr, ByteCount);
}
return len;
@@ -2668,7 +2668,7 @@
ByteCount,
ImageInfo->encode_jis,
ImageInfo->motorola_intel ?
ImageInfo->decode_jis_be : ImageInfo->decode_jis_le
- TSRMLS_DC) != 0) {
+ TSRMLS_CC) != 0) {
len = exif_process_string_raw(pszInfoPtr,
szValuePtr, ByteCount);
}
return len;
@@ -2707,7 +2707,7 @@
ByteCount,
ImageInfo->encode_unicode,
ImageInfo->motorola_intel ?
ImageInfo->decode_unicode_be : ImageInfo->decode_unicode_le
- TSRMLS_DC) != 0) {
+ TSRMLS_CC) != 0) {
xp_field->size = exif_process_string_raw(&xp_field->value,
szValuePtr, ByteCount);
}
return xp_field->size;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867
Hello Dmitry. After this update ext/exif always produces these warnings: # php -v PHP Warning: PHP Startup: Illegal encoding ignored: 'ISO-8859-15' in Unknown on line 0 PHP Warning: PHP Startup: Illegal encoding ignored: 'UCS-2BE' in Unknown on line 0 PHP Warning: PHP Startup: Illegal encoding ignored: 'UCS-2LE' in Unknown on line 0 PHP Warning: PHP Startup: Illegal encoding ignored: 'JIS' in Unknown on line 0 PHP Warning: PHP Startup: Illegal encoding ignored: 'JIS' in Unknown on line 0 PHP 5.3.99-dev (cli) (built: Dec 8 2010 14:37:43) (DEBUG) Copyright (c) 1997-2010 The PHP Group Zend Engine v2.4.0, Copyright (c) 1998-2010 Zend Technologies On 12/08/2010 02:27 PM, Dmitry Stogov wrote: > dmitry Wed, 08 Dec 2010 11:27:34 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=306077 > > Log: > Removed compile time dependency from ext/mbstring > > Changed paths: > U php/php-src/trunk/NEWS > U php/php-src/trunk/Zend/zend_compile.c > U php/php-src/trunk/Zend/zend_globals.h > U php/php-src/trunk/Zend/zend_multibyte.c > U php/php-src/trunk/Zend/zend_multibyte.h > U php/php-src/trunk/ext/exif/exif.c > U php/php-src/trunk/ext/mbstring/mbstring.c > U php/php-src/trunk/ext/standard/html.c > U php/php-src/trunk/main/rfc1867.c > U php/php-src/trunk/main/rfc1867.h > A php/php-src/trunk/tests/basic/028.phpt > A php/php-src/trunk/tests/basic/029.phpt > > -- Wbr, Antony Dovgal --- http://pinba.org - realtime statistics for PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/gd/gd.c trunk/ext/gd/gd.c
What about 5.2?
On Wed, Dec 8, 2010 at 3:45 AM, Pierre Joye wrote:
> pajoye Wed, 08 Dec 2010 08:45:56 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=306075
>
> Log:
> - Fix #53492, fix crash if aa steps are invalid
>
> Bug: http://bugs.php.net/53492 (Assigned) Stack buffer overflow in imagepstext
>
> Changed paths:
> U php/php-src/branches/PHP_5_3/NEWS
> U php/php-src/branches/PHP_5_3/ext/gd/gd.c
> U php/php-src/trunk/ext/gd/gd.c
>
> Modified: php/php-src/branches/PHP_5_3/NEWS
> ===
> --- php/php-src/branches/PHP_5_3/NEWS 2010-12-08 08:20:44 UTC (rev 306074)
> +++ php/php-src/branches/PHP_5_3/NEWS 2010-12-08 08:45:56 UTC (rev 306075)
> @@ -207,7 +207,10 @@
> and trailing :: in the filter extension). (Gustavo)
> . Fixed bug #50117 (problems in the validation of IPv6 addresses with IPv4
> addresses and ::). (Gustavo)
> -
> +
> +- GD extension:
> + . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
> +
> - GMP extension:
> . Fixed bug #52906 (gmp_mod returns negative result when non-negative is
> expected). (Stas)
>
> Modified: php/php-src/branches/PHP_5_3/ext/gd/gd.c
> ===
> --- php/php-src/branches/PHP_5_3/ext/gd/gd.c 2010-12-08 08:20:44 UTC (rev
> 306074)
> +++ php/php-src/branches/PHP_5_3/ext/gd/gd.c 2010-12-08 08:45:56 UTC (rev
> 306075)
> @@ -4228,6 +4228,11 @@
> return;
> }
>
> + if (aa_steps != 4 || aa_steps != 16) {
> + php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be
> 4 or 16");
> + RETURN_FALSE;
> + }
> +
> ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
> ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
>
>
> Modified: php/php-src/trunk/ext/gd/gd.c
> ===
> --- php/php-src/trunk/ext/gd/gd.c 2010-12-08 08:20:44 UTC (rev 306074)
> +++ php/php-src/trunk/ext/gd/gd.c 2010-12-08 08:45:56 UTC (rev 306075)
> @@ -4290,6 +4290,11 @@
> return;
> }
>
> + if (aa_steps != 4 || aa_steps != 16) {
> + php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be
> 4 or 16");
> + RETURN_FALSE;
> + }
> +
> ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
> ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
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 Zend/zend_compile.c Zend/zend_globals.h Zend/zend_multibyte.c Zend/zend_multibyte.h ext/exif/exif.c ext/mbstring/mbstring.c ext/standard/html.c main/rfc1867.c m
dmitry Wed, 08 Dec 2010 11:27:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306077
Log:
Removed compile time dependency from ext/mbstring
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_globals.h
U php/php-src/trunk/Zend/zend_multibyte.c
U php/php-src/trunk/Zend/zend_multibyte.h
U php/php-src/trunk/ext/exif/exif.c
U php/php-src/trunk/ext/mbstring/mbstring.c
U php/php-src/trunk/ext/standard/html.c
U php/php-src/trunk/main/rfc1867.c
U php/php-src/trunk/main/rfc1867.h
A php/php-src/trunk/tests/basic/028.phpt
A php/php-src/trunk/tests/basic/029.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-12-08 09:38:47 UTC (rev 306076)
+++ php/php-src/trunk/NEWS 2010-12-08 11:27:34 UTC (rev 306077)
@@ -32,6 +32,7 @@
. Added multibyte suppport by default. Previosly php had to be compiled
with --enable-zend-multibyte. Now it can be enabled or disabled throug
zend.multibyte directive in php.ini (Dmitry)
+ . Removed compile time dependency from ext/mbstring (Dmitry)
. Added scalar typehints to the parser and the reflection API. (Ilia, Derick)
. Added support for Traits. (Stefan)
. Added closure $this support back. (Stas)
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2010-12-08 09:38:47 UTC (rev 306076)
+++ php/php-src/trunk/Zend/zend_compile.c 2010-12-08 11:27:34 UTC (rev 306077)
@@ -200,9 +200,6 @@
CG(script_encoding_list) = NULL;
CG(script_encoding_list_size) = 0;
CG(internal_encoding) = NULL;
- CG(encoding_detector) = NULL;
- CG(encoding_converter) = NULL;
- CG(encoding_oddlen) = NULL;
CG(encoding_declared) = 0;
}
/* }}} */
Modified: php/php-src/trunk/Zend/zend_globals.h
===
--- php/php-src/trunk/Zend/zend_globals.h 2010-12-08 09:38:47 UTC (rev 306076)
+++ php/php-src/trunk/Zend/zend_globals.h 2010-12-08 11:27:34 UTC (rev 306077)
@@ -155,11 +155,6 @@
zend_encoding *internal_encoding;
- /* multibyte utility functions */
- zend_encoding_detector encoding_detector;
- zend_encoding_converter encoding_converter;
- zend_encoding_oddlen encoding_oddlen;
-
#ifdef ZTS
zval ***static_members_table;
int last_static_member;
Modified: php/php-src/trunk/Zend/zend_multibyte.c
===
--- php/php-src/trunk/Zend/zend_multibyte.c 2010-12-08 09:38:47 UTC (rev 306076)
+++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-08 11:27:34 UTC (rev 306077)
@@ -513,8 +513,37 @@
NULL
};
+static char* dummy_encoding_detector(const unsigned char *string, size_t length, char *list TSRMLS_DC)
+{
+ return NULL;
+}
+static int dummy_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const char *encoding_to, const char *encoding_from TSRMLS_DC)
+{
+ return -1;
+}
+static size_t dummy_encoding_oddlen(const unsigned char *string, size_t length, const char *encoding TSRMLS_DC)
+{
+ return 0;
+}
+
+static int dummy_encoding_list_checker(const char *encoding_list TSRMLS_DC)
+{
+ return 0;
+}
+
+static const char* dummy_get_internal_encoding(TSRMLS_D)
+{
+ return NULL;
+}
+
+ZEND_API zend_encoding_detector zend_multibyte_encoding_detector = dummy_encoding_detector;
+ZEND_API zend_encoding_converter zend_multibyte_encoding_converter = dummy_encoding_converter;
+ZEND_API zend_encoding_oddlen zend_multibyte_encoding_oddlen = dummy_encoding_oddlen;
+ZEND_API zend_encoding_list_checker zend_multibyte_check_encoding_list = dummy_encoding_list_checker;
+ZEND_API zend_encoding_name_getter zend_multibyte_get_internal_encoding = dummy_get_internal_encoding;
+
ZEND_API int zend_multibyte_set_script_encoding(const char *encoding_list,
size_t encoding_list_size TSRMLS_DC)
{
@@ -540,11 +569,13 @@
return 0;
}
-ZEND_API int zend_multibyte_set_functions(zend_encoding_detector encoding_detector, zend_encoding_converter encoding_converter, zend_encoding_oddlen encoding_oddlen TSRMLS_DC)
+ZEND_API int zend_multibyte_set_functions(zend_encoding_detector encoding_detector, zend_encoding_converter encoding_converter, zend_encoding_oddlen encoding_oddlen, zend_encoding_list_checker encoding_list_checker, zend_encoding_name_getter get_internal_encoding TSRMLS_DC)
{
- CG(encoding_detector) = encoding_detector;
- CG(encoding_converter) = encoding_converter;
- CG(encoding_oddlen) = encoding_oddlen;
+ zend_multibyte_encoding_detector = encoding_detector;
+ zend_multibyte_encoding_converter = encoding_converter;
+ zend_multibyte_encoding_oddlen = encoding_oddlen;
+ zend_multibyte_check_encoding_list = encoding_list_checker;
+ zend_multibyte_get_internal_encoding = get_interna
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ UPGRADING
pajoye Wed, 08 Dec 2010 09:38:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=306076 Log: - new warning in imagepstext Changed paths: U php/php-src/branches/PHP_5_3/UPGRADING Modified: php/php-src/branches/PHP_5_3/UPGRADING === --- php/php-src/branches/PHP_5_3/UPGRADING 2010-12-08 08:45:56 UTC (rev 306075) +++ php/php-src/branches/PHP_5_3/UPGRADING 2010-12-08 09:38:47 UTC (rev 306076) @@ -276,6 +276,8 @@ - MySQLi: Now supports persistent connections by prepending the hostname with "p:". +- imagepstext now rejects invalid antialiasing steps and raises a warning. + d. no longer possible to disable - PCRE -- 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 branches/PHP_5_3/ext/gd/gd.c trunk/ext/gd/gd.c
pajoye Wed, 08 Dec 2010 08:45:56 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306075
Log:
- Fix #53492, fix crash if aa steps are invalid
Bug: http://bugs.php.net/53492 (Assigned) Stack buffer overflow in imagepstext
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/gd/gd.c
U php/php-src/trunk/ext/gd/gd.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-08 08:20:44 UTC (rev 306074)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-08 08:45:56 UTC (rev 306075)
@@ -207,7 +207,10 @@
and trailing :: in the filter extension). (Gustavo)
. Fixed bug #50117 (problems in the validation of IPv6 addresses with IPv4
addresses and ::). (Gustavo)
-
+
+- GD extension:
+ . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
+
- GMP extension:
. Fixed bug #52906 (gmp_mod returns negative result when non-negative is
expected). (Stas)
Modified: php/php-src/branches/PHP_5_3/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_3/ext/gd/gd.c2010-12-08 08:20:44 UTC (rev
306074)
+++ php/php-src/branches/PHP_5_3/ext/gd/gd.c2010-12-08 08:45:56 UTC (rev
306075)
@@ -4228,6 +4228,11 @@
return;
}
+ if (aa_steps != 4 || aa_steps != 16) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4
or 16");
+ RETURN_FALSE;
+ }
+
ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
Modified: php/php-src/trunk/ext/gd/gd.c
===
--- php/php-src/trunk/ext/gd/gd.c 2010-12-08 08:20:44 UTC (rev 306074)
+++ php/php-src/trunk/ext/gd/gd.c 2010-12-08 08:45:56 UTC (rev 306075)
@@ -4290,6 +4290,11 @@
return;
}
+ if (aa_steps != 4 || aa_steps != 16) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4
or 16");
+ RETURN_FALSE;
+ }
+
ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
