Re: com php-src: zend_hash_del>zend_hash_str_del: main/main.c
| From: | Dmitry Stogov | Date: | Thu, 15 May 2014 08:31:23 +0000 |
| Subject: | Re: com php-src: zend_hash_del>zend_hash_str_del: main/main.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-78367@lists.php.net to get a copy of this message | ||
Also remove +1 after strlen().
Thanks. Dmitry.
On Thu, May 15, 2014 at 12:16 PM, Pierre Joye <pajoye@php.net> wrote:
> Commit: 365446763f26da393234edbe4b0ca8077df8be67
> Author: Pierre Joye <pierre.php@gmail.com> Thu, 15 May 2014
> 10:16:19 +0200
> Parents: 6e84e4a28e67894cffea3af9d8c0543e96e23a2e
> Branches: phpng
>
> Link:
>
> http://git.php.net/?p=php-src.git;a=commitdiff;h=365446763f26da393234edbe4b0ca8077df8be67
>
> Log:
> zend_hash_del>zend_hash_str_del
>
> Changed paths:
> M main/main.c
>
>
> Diff:
> diff --git a/main/main.c b/main/main.c
> index 87e0b39..92754a5 100644
> --- a/main/main.c
> +++ b/main/main.c
> @@ -135,7 +135,7 @@ static php_win32_disable_functions(TSRMLS_D)
>
> if (EG(windows_version_info).dwMajorVersion < 5) {
> for (i = 0; i < function_name_cnt_5; i++) {
> - if (zend_hash_del(CG(function_table),
> function_name_5[i], strlen(function_name_5[i]) + 1)==FAILURE) {
> + if (zend_hash_str_del(CG(function_table),
> function_name_5[i], strlen(function_name_5[i]) + 1)==FAILURE) {
> php_printf("Unable to disable function
> '%s'\n", function_name_5[i]);
> return FAILURE;
> }
> @@ -144,7 +144,7 @@ static php_win32_disable_functions(TSRMLS_D)
>
> if (EG(windows_version_info).dwMajorVersion < 6) {
> for (i = 0; i < function_name_cnt_6; i++) {
> - if (zend_hash_del(CG(function_table),
> function_name_6[i], strlen(function_name_6[i]) + 1)==FAILURE) {
> + if (zend_hash_str_del(CG(function_table),
> function_name_6[i], strlen(function_name_6[i]) + 1)==FAILURE) {
> php_printf("Unable to disable function
> '%s'\n", function_name_6[i]);
> return FAILURE;
> }
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>