[PHP-CVS] com php-src: Fix unitialized vars when sql.safe_mode=1: ext/mysql/php_mysql.c
Commit:86db5fb4c2b7199dc862dfce99c345c49305ba8a
Author:Anatol Belski Wed, 15 May 2013 11:12:17 +0200
Parents: ba1af298052cbef7329e330f2d3f9749b9be65bb
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=86db5fb4c2b7199dc862dfce99c345c49305ba8a
Log:
Fix unitialized vars when sql.safe_mode=1
which can break the subsequent mysqlnd_connect() call
Changed paths:
M ext/mysql/php_mysql.c
Diff:
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 51a060c..c85e523 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -690,7 +690,7 @@ PHP_MINFO_FUNCTION(mysql)
static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{
char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL,
*tmp=NULL, *host=NULL;
- int user_len, passwd_len, host_len;
+ int user_len = 0, passwd_len = 0, host_len = 0;
char *hashed_details=NULL;
int hashed_details_length, port = MYSQL_PORT;
long client_flags = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysql/php_mysql.c ext/phar/phar_object.c ext/phar/util.c
Commit:de82e7edf7c91afab236a087ce4900868066b5d7 Author:Anatol Belski Wed, 15 May 2013 11:14:58 +0200 Parents: 1a46a102d96e08d1256770ddca3e9d955bcec025 86db5fb4c2b7199dc862dfce99c345c49305ba8a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de82e7edf7c91afab236a087ce4900868066b5d7 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure Changed paths: MM ext/mysql/php_mysql.c MM ext/phar/phar_object.c MM ext/phar/util.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysql/php_mysql.c ext/phar/phar_object.c
Commit:077b575d51630641fbd4b664bd18cfc335f76ebe Author:Anatol Belski Wed, 15 May 2013 11:17:18 +0200 Parents: 1f97fde89e5e54c4f360b07d348d0f14634808b3 de82e7edf7c91afab236a087ce4900868066b5d7 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=077b575d51630641fbd4b664bd18cfc335f76ebe Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure Changed paths: MM ext/mysql/php_mysql.c MM ext/phar/phar_object.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixe preprocessor definition: ext/gd/config.w32
Commit:082ee90b9bc9b6487b36831f34acfc901c671c41
Author:Anatol Belski Wed, 15 May 2013 14:24:21 +0200
Parents: 077b575d51630641fbd4b664bd18cfc335f76ebe
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=082ee90b9bc9b6487b36831f34acfc901c671c41
Log:
fixe preprocessor definition
Changed paths:
M ext/gd/config.w32
Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index e6fbc49..1420b11 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -69,7 +69,7 @@ if (PHP_GD != "no") {
/D HAVE_GD_WBMP \
/D HAVE_GD_XBM \
/D HAVE_GD_XPM \
-/D HAVE_LIBFREETYPE=1 \
+/D HAVE_GD_FREETYPE=1 \
/D HAVE_LIBGD13=1 \
/D HAVE_LIBGD15=1 \
/D HAVE_LIBGD20=1 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix array_colum segfault: ext/standard/array.c
Commit:139e9824adfa52c68ac45a0d8886f50ae50c0164
Author:David Soria Parra Wed, 15 May 2013 14:27:59
+0200
Parents: 082ee90b9bc9b6487b36831f34acfc901c671c41
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=139e9824adfa52c68ac45a0d8886f50ae50c0164
Log:
Fix array_colum segfault
Separate zval to avoid gc from freeing
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index cfe9be8..9bfb088 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2608,11 +2608,9 @@ PHP_FUNCTION(array_column)
} else if (zkeyval && Z_TYPE_PP(zkeyval) == IS_LONG) {
add_index_zval(return_value, Z_LVAL_PP(zkeyval),
*zcolval);
} else if (zkeyval && Z_TYPE_PP(zkeyval) == IS_OBJECT) {
- zval copyval;
- ZVAL_ZVAL(©val, *zkeyval, 1, 0);
- convert_to_string(©val);
- add_assoc_zval(return_value, Z_STRVAL(copyval),
*zcolval);
- zval_dtor(©val);
+ SEPARATE_ZVAL(zkeyval);
+ convert_to_string(*zkeyval);
+ add_assoc_zval(return_value, Z_STRVAL_PP(zkeyval),
*zcolval);
} else {
add_next_index_zval(return_value, *zcolval);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/phar_object.c
Commit:42a186e22d6621dfb606fa2e562140faa08e8c99 Author:Pierre Joye Tue, 14 May 2013 16:46:32 +0200 Parents: 362402d7484725287b5eae23936b09e570d83d48 7ec2e5314eb62d9cd2ef23e0b62445eb50cc23c0 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=42a186e22d6621dfb606fa2e562140faa08e8c99 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: more check for php_stream_fopen_tmpfile failure Changed paths: MM ext/phar/phar_object.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/phar_object.c ext/phar/util.c
Commit:7ec2e5314eb62d9cd2ef23e0b62445eb50cc23c0 Author:Pierre Joye Tue, 14 May 2013 16:45:56 +0200 Parents: f37c54ab276bc55339e4b8aa2b6f5caa88cb4b86 ba1af298052cbef7329e330f2d3f9749b9be65bb Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ec2e5314eb62d9cd2ef23e0b62445eb50cc23c0 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: more check for php_stream_fopen_tmpfile failure Changed paths: MM ext/phar/phar_object.c MM ext/phar/util.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
bjoriWed, 15 May 2013 17:07:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=330224 Log: Give everyone php-src karma back after Pierre split the lines Give jas phpdoc karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-05-15 08:27:21 UTC (rev 330223) +++ SVNROOT/global_avail2013-05-15 17:07:24 UTC (rev 330224) @@ -22,8 +22,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabop,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,! dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel,marco,keyur,mattficken,szarkos -|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git +avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabop,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,! dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel,marco,keyur,mattficken,szarkos|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git # Engine karma is further restricted (this line MUST come after lines granting # php-src karma and before lines granting Zend/TSRM karma) @@ -185,7 +184,7 @@ avail|fmk|php-src.git/ext/mssql avail|asautins,dbenson,maxim,ray,abonamous,ldixon|php-src.git/ext/oci8 avail|kara,fmk,sschadt,nicos|php-src.git/ext/odbc -avail|venaas,jas|php-src.git/ext/openssl,php-src.git/NEWS,php-src.git/UPGRADING +avail|venaas,jas|php-src.git/ext/openssl,php-src.git/NEWS,php-src.git/UPGRADING,phpdoc/en avail|kara|php-src.git/ext/oracle,pecl/oracle avail|nmav|php-src.git/ext/ovrimos,pecl/ovrimos avail|steinm|php-src.git/ext/pdf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: updated NEWS: NEWS
Commit:07bd1fac57b1f608c15c5d5ebaa6d9383c7cc564 Author:Anatol Belski Thu, 16 May 2013 08:44:36 +0200 Parents: fda25c7ea68a35d55cc72368a344a787608a0b29 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=07bd1fac57b1f608c15c5d5ebaa6d9383c7cc564 Log: updated NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 99dcbe7..95ef3dc 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||| ?? ??? 2013, PHP 5.5.0 Release Candidate 2 +- Core: + . Fixed bug #64853 (Use of no longer available ini directives causes crash +on TS build). (Anatol) + - Fileinfo: . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #64853Use of no longer available ini directives causes crash on TS build: NEWS main/main.c
Commit:d82704b6779cf54e9c8bd16ecc78c612892b4c9d Author:Anatol Belski Thu, 16 May 2013 08:40:56 +0200 Parents: 09470ebf35a47ac34c3ffa5524ccb47ff404cd5a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d82704b6779cf54e9c8bd16ecc78c612892b4c9d Log: Fixed bug #64853Use of no longer available ini directives causes crash on TS build The fatal error for removed ini options is thrown before the executor init, so ensure the relevant variables are initialized. Bugs: https://bugs.php.net/64853 Changed paths: M NEWS M main/main.c Diff: diff --git a/NEWS b/NEWS index 879f13b..5aeb4c9 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ PHP NEWS - Core: . Fixed bug #64729 (compilation failure on x32). (Gustavo) + . Fixed bug #64853 (Use of no longer available ini directives causes crash on +TS build). (Anatol) - Fileinfo: . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol) diff --git a/main/main.c b/main/main.c index 7a253f8..c0db64d 100644 --- a/main/main.c +++ b/main/main.c @@ -2070,6 +2070,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod EG(exception_class) = NULL; PG(disable_functions) = NULL; PG(disable_classes) = NULL; + EG(exception) = NULL; + EG(objects_store).object_buckets = NULL; #if HAVE_SETLOCALE setlocale(LC_CTYPE, ""); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/main.c
Commit:fda25c7ea68a35d55cc72368a344a787608a0b29 Author:Anatol Belski Thu, 16 May 2013 08:43:07 +0200 Parents: 9accfee55f80ec7da23bb948c49fcaa3e97bc2ca d82704b6779cf54e9c8bd16ecc78c612892b4c9d Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fda25c7ea68a35d55cc72368a344a787608a0b29 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #64853Use of no longer available ini directives causes crash on TS build Bugs: https://bugs.php.net/64853 Changed paths: MM main/main.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': main/main.c
Commit:2933f77e39fae55b48bf685e8b2da474f1274eb5 Author:Anatol Belski Thu, 16 May 2013 08:45:02 +0200 Parents: f5d5a50a1c3fe406d87edaa6396e690588c7be81 07bd1fac57b1f608c15c5d5ebaa6d9383c7cc564 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2933f77e39fae55b48bf685e8b2da474f1274eb5 Log: Merge branch 'PHP-5.5' * PHP-5.5: updated NEWS Fixed bug #64853Use of no longer available ini directives causes crash on TS build Bugs: https://bugs.php.net/64853 Changed paths: MM main/main.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
