Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:50397
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.214.42 as permitted sender)
DomainKey-Status: bad
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :content-type;
        b=nVzyNaMrRfDr2wyYY/giB0qw2gniiGA+7cbUG4uemYiIiGv+NSzCDBHU2vdf8UmVZH
         IWXswQQ08eSRwiRSNr+CjFC0HJWM20K6KvTDw7hMimYgaqiD6n+7wjXvskbOaI4X8Heh
         E7Oa75rd6RWASnd9skpXFMA7ELgbaM/68K8N4=
MIME-Version: 1.0
In-Reply-To: <20101119154301.GB9213@redhat.com>
References: <20101119154301.GB9213@redhat.com>
Date: Fri, 19 Nov 2010 20:07:47 -0200
Message-ID: <AANLkTi=yV2r3ti2Ce_AAGa0uNn4yCq8UBRAWWrC50r2C@mail.gmail.com>
To: internals@lists.php.net
Content-Type: multipart/alternative; boundary=00032555795635799b04956f2426
Subject: Re: [PHP-DEV] [PATCH] fix extract w.r.t GLOBALS again
From: felipensp@gmail.com (Felipe Pena)

--00032555795635799b04956f2426
Content-Type: text/plain; charset=UTF-8

Hi,

2010/11/19 Joe Orton <jorton@redhat.com>

> The check to prevent extract() overwriting $GLOBALS got broken at some
> point - here's a fix:
>
> Index: ext/standard/array.c
> ===================================================================
> --- ext/standard/array.c        (revision 305556)
> +++ ext/standard/array.c        (working copy)
> @@ -1389,10 +1389,10 @@
>
>                        case EXTR_OVERWRITE:
>                                /* GLOBALS protection */
> -                               if (var_exists && var_name_len ==
> sizeof("GLOBALS") && !strcmp(var_name, "GLOBALS")) {
> +                               if (var_exists && var_name_len ==
> sizeof("GLOBALS")-1 && !strcmp(var_name, "GLOBALS")) {
>                                        break;
>                                }
> -                               if (var_exists && var_name_len ==
> sizeof("this")  && !strcmp(var_name, "this") && EG(scope) &&
> EG(scope)->name_length != 0) {
> +                               if (var_exists && var_name_len ==
> sizeof("this")-1 && !strcmp(var_name, "this") && EG(scope) &&
> EG(scope)->name_length != 0) {
>                                        break;
>                                }
>                                ZVAL_STRINGL(&final_name, var_name,
> var_name_len, 1);
> Index: ext/standard/tests/array/extract_safety.phpt
> ===================================================================
> --- ext/standard/tests/array/extract_safety.phpt        (revision 0)
> +++ ext/standard/tests/array/extract_safety.phpt        (revision 0)
> @@ -0,0 +1,24 @@
> +--TEST--
> +Test extract() for overwrite of GLOBALS
> +--FILE--
> +<?php
> +$str = "John";
> +debug_zval_dump($GLOBALS["str"]);
> +
> +/* Extracting Global Variables */
> +$splat = array("foo" => "bar");
> +var_dump(extract(array("GLOBALS" => $splat, EXTR_OVERWRITE)));
> +
> +unset ($splat);
> +
> +debug_zval_dump($GLOBALS["str"]);
> +
> +echo "\nDone";
> +?>
> +
> +--EXPECTF--
> +string(4) "John" refcount(2)
> +int(0)
> +string(4) "John" refcount(2)
> +
> +Done
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
I committed your fix in the 5.2, 5.3 and trunk.

Thanks for the patch!

-- 
Regards,
Felipe Pena

--00032555795635799b04956f2426--