Re: com php-src: Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20): NEWS ext/session/session.c
ext/session/tests/session_regenerate_id_fastshutdown.phpt

From: Date: Wed, 28 Jan 2015 11:59:25 +0000
Subject: Re: com php-src: Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20): NEWS ext/session/session.c
ext/session/tests/session_regenerate_id_fastshutdown.phpt
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84411@lists.php.net to get a copy of this message
Hi Xinchen, Since PHP7 is new, Zend API that creates/updates constant may be nice to have. -- Yasuo Ohgaki yohgaki@ohgaki.net On Wed, Jan 28, 2015 at 6:12 PM, Xinchen Hui <laruence@php.net> wrote: > Commit: a0cf0251347d77235ca7420debdc4432c0c1eec3 > Author: Xinchen Hui <laruence@php.net> Wed, 28 Jan 2015 > 17:12:23 +0800 > Parents: 638d0cb7531525201e00577d5a77f1da3f84811e > Branches: master > > Link: > > http://git.php.net/?p=php-src.git;a=commitdiff;h=a0cf0251347d77235ca7420debdc4432c0c1eec3 > > Log: > Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM > 6.5.20) > > Bugs: > https://bugs.php.net/68868 > > Changed paths: > M NEWS > M ext/session/session.c > A ext/session/tests/session_regenerate_id_fastshutdown.phpt > > > Diff: > diff --git a/NEWS b/NEWS > index 9d669be..417c2ac 100644 > --- a/NEWS > +++ b/NEWS > @@ -8,6 +8,8 @@ > . Update the MIME type list from the one shipped by Apache HTTPD. (Adam) > > - Core: > + . Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM > + 6.5.20). (Laruence) > . Fixed bug #68104 (Segfault while pre-evaluating a disabled function). > (Laruence) > . Fixed bug #68252 (segfault in Zend/zend_hash.c in function > diff --git a/ext/session/session.c b/ext/session/session.c > index ab32857..7d78b91 100644 > --- a/ext/session/session.c > +++ b/ext/session/session.c > @@ -1401,6 +1401,7 @@ static void ppid2sid(zval *ppid) { > PHPAPI void php_session_reset_id(void) /* {{{ */ > { > int module_number = PS(module_number); > + zval *sid; > > if (!PS(id)) { > php_error_docref(NULL, E_WARNING, "Cannot set session ID - > session ID is not initialized"); > @@ -1413,7 +1414,9 @@ PHPAPI void php_session_reset_id(void) /* {{{ */ > } > > /* if the SID constant exists, destroy it. */ > - zend_hash_str_del(EG(zend_constants), "sid", sizeof("sid") - 1); > + /* We must not delete any items in EG(zend_contants) */ > + /* zend_hash_str_del(EG(zend_constants), "sid", sizeof("sid") - > 1); */ > + sid = zend_get_constant_str("SID", sizeof("SID") - 1); > > if (PS(define_sid)) { > smart_str var = {0}; > @@ -1422,10 +1425,20 @@ PHPAPI void php_session_reset_id(void) /* {{{ */ > smart_str_appendc(&var, '='); > smart_str_appends(&var, PS(id)->val); > smart_str_0(&var); > - REGISTER_STRINGL_CONSTANT("SID", var.s->val, var.s->len, > 0); > - smart_str_free(&var); > + if (sid) { > + zend_string_release(Z_STR_P(sid)); > + ZVAL_STR(sid, var.s); > + } else { > + REGISTER_STRINGL_CONSTANT("SID", var.s->val, > var.s->len, 0); > + smart_str_free(&var); > + } > } else { > - REGISTER_STRINGL_CONSTANT("SID", "", 0, 0); > + if (sid) { > + zend_string_release(Z_STR_P(sid)); > + ZVAL_EMPTY_STRING(sid); > + } else { > + REGISTER_STRINGL_CONSTANT("SID", "", 0, 0); > + } > } > > if (PS(apply_trans_sid)) { > diff --git a/ext/session/tests/session_regenerate_id_fastshutdown.phpt > b/ext/session/tests/session_regenerate_id_fastshutdown.phpt > new file mode 100644 > index 0000000..961965f > --- /dev/null > +++ b/ext/session/tests/session_regenerate_id_fastshutdown.phpt > @@ -0,0 +1,14 @@ > +--TEST-- > +Test session_regenerate_id() function : basic functionality > +--SKIPIF-- > +<?php include('skipif.inc'); ?> > +--INI-- > +opcache.fast_shutdown=1 > +--FILE-- > +<?php > +session_start(); > +define ("user", "foo"); > +var_dump(session_regenerate_id()); > +?> > +--EXPECT-- > +bool(true) > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >

« previous php.cvs (#84411) next »