Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
What should be MFH'ed? I haven't touched HEAD with this. I don't have cvs access here, will only be able to commit friday. Is there still regression issues or my last patch fixed it? Thanks Olivier (Mobile) On 8/5/08, Lukas Kahwe Smith <[EMAIL PROTECTED]> wrote: > > On 31.07.2008, at 09:18, Derick Rethans wrote: > >> On Mon, 28 Jul 2008, Olivier Hill wrote: >> >>> Indeed, I forgot to test that case. If I remember correctly, there >>> was >>> no test cases for that function, so I'll fix this tonight and add >>> some >>> tests. >> >> I didn't see a commit - have you forgotten about it? >> >> regards, >> Derick > > > still not MFH'ed .. or? > > regards, > Lukas Kahwe Smith > [EMAIL PROTECTED] > > > > -- Olivier Hill, ing. jr. http://www.olivierhill.ca/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
ohill Thu Jul 31 14:20:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard string.c Log: Fix regression issue http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.32&r2=1.445.2.14.2.69.2.33&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.32 php-src/ext/standard/string.c:1.445.2.14.2.69.2.33 --- php-src/ext/standard/string.c:1.445.2.14.2.69.2.32 Tue Jul 22 01:10:58 2008 +++ php-src/ext/standard/string.c Thu Jul 31 14:20:40 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.445.2.14.2.69.2.32 2008/07/22 01:10:58 scottmac Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69.2.33 2008/07/31 14:20:40 ohill Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -4104,10 +4104,6 @@ return; } - if (!arglen) { - return; - } - res = estrndup(arg, arglen); if (arrayArg == NULL) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
Indeed, I forgot to test that case. If I remember correctly, there was no test cases for that function, so I'll fix this tonight and add some tests. Regards On 7/28/08, Derick Rethans <[EMAIL PROTECTED]> wrote: > On Wed, 25 Jun 2008, Olivier Hill wrote: > >> ohillWed Jun 25 12:16:17 2008 UTC >> >> Modified files: (Branch: PHP_5_3) >> /php-src/ext/standardstring.c > > > >> Log: >> New parameter parsing API > > The following change introduces a regression: > > @@ -4135,24 +4095,23 @@ > Parses GET/POST/COOKIE data and sets global variables */ > PHP_FUNCTION(parse_str) > { > - zval **arg; > - zval **arrayArg; > + char *arg; > + zval **arrayArg = NULL; > zval *sarg; > char *res = NULL; > - int argCount; > + int arglen; > > - argCount = ZEND_NUM_ARGS(); > - if (argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, > &arg, &arrayArg) == FAILURE) { > - WRONG_PARAM_COUNT; > + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Z", &arg, > &arglen, &arrayArg) == FAILURE) { > + return; > } > > - convert_to_string_ex(arg); > - sarg = *arg; > - if (Z_STRVAL_P(sarg) && *Z_STRVAL_P(sarg)) { > - res = estrndup(Z_STRVAL_P(sarg), Z_STRLEN_P(sarg)); > + if (!arglen) { > + return; > } > > - if (argCount == 1) { > + res = estrndup(arg, arglen); > + > + if (arrayArg == NULL) { > zval tmp; > > if (!EG(active_symbol_table)) { > > > [EMAIL PROTECTED]:~$ php-5.2dev -r 'parse_str( "", $p ); var_dump( $p );' > > array(0) { > } > > [EMAIL PROTECTED]:~$ php-5.3dev -r 'parse_str( "", $p ); var_dump( $p );' > NULL > > Please fix this - a test file is attached. > > regards, > Derick > > -- > HEAD before 5_3!: http://tinyurl.com/6d2esb > http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- Olivier Hill, ing. jr. http://www.olivierhill.ca/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard file.c /ext/standard/tests/file 007_error.phpt fflush_error.phpt fgetc_error.phpt fgetc_variation2.phpt fgets_error.phpt fgets_variation2.phpt fgetss_err
ohill Thu Jul 3 20:19:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard file.c /php-src/ext/standard/tests/file007_error.phpt fflush_error.phpt fgetc_error.phpt fgetc_variation2.phpt fgets_error.phpt fgets_variation2.phpt fgetss_error.phpt fpassthru_error.phpt fread_error.phpt fseek_ftell_rewind_error1.phpt fseek_ftell_rewind_error2.phpt fseek_ftell_rewind_error3.phpt ftruncate_error.phpt fwrite.phpt fwrite_error.phpt popen_pclose_error.phpt umask_error.phpt Log: New parameter parsing API http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.14&r2=1.409.2.6.2.28.2.15&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.14 php-src/ext/standard/file.c:1.409.2.6.2.28.2.15 --- php-src/ext/standard/file.c:1.409.2.6.2.28.2.14 Fri May 16 12:44:11 2008 +++ php-src/ext/standard/file.c Thu Jul 3 20:19:26 2008 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.14 2008/05/16 12:44:11 felipe Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.15 2008/07/03 20:19:26 ohill Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -895,14 +895,14 @@ Close an open file pointer */ PHPAPI PHP_FUNCTION(fclose) { - zval **arg1; + zval *arg1; php_stream *stream; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + RETURN_FALSE; } - - PHP_STREAM_TO_ZVAL(stream, arg1); + + PHP_STREAM_TO_ZVAL(stream, &arg1); if (!stream->is_persistent) { zend_list_delete(stream->rsrc_id); } else { @@ -996,14 +996,14 @@ Close a file pointer opened by popen() */ PHP_FUNCTION(pclose) { - zval **arg1; + zval *arg1; php_stream *stream; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + RETURN_FALSE; } - PHP_STREAM_TO_ZVAL(stream, arg1); + PHP_STREAM_TO_ZVAL(stream, &arg1); zend_list_delete(stream->rsrc_id); RETURN_LONG(FG(pclose_ret)); @@ -1014,14 +1014,14 @@ Test for end-of-file on a file pointer */ PHPAPI PHP_FUNCTION(feof) { - zval **arg1; + zval *arg1; php_stream *stream; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + RETURN_FALSE; } - PHP_STREAM_TO_ZVAL(stream, arg1); + PHP_STREAM_TO_ZVAL(stream, &arg1); if (php_stream_eof(stream)) { RETURN_TRUE; @@ -1035,18 +1035,18 @@ Get a line from file pointer */ PHPAPI PHP_FUNCTION(fgets) { - zval **arg1, **arg2; - int len = 1024; + zval *arg1; + long len = 1024; char *buf = NULL; int argc = ZEND_NUM_ARGS(); size_t line_len = 0; php_stream *stream; - if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &arg1, &arg2) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &arg1, &len) == FAILURE) { + RETURN_FALSE; } - PHP_STREAM_TO_ZVAL(stream, arg1); + PHP_STREAM_TO_ZVAL(stream, &arg1); if (argc == 1) { /* ask streams to give us a buffer of an appropriate size */ @@ -1055,9 +1055,6 @@ goto exit_failed; } } else if (argc > 1) { - convert_to_long_ex(arg2); - len = Z_LVAL_PP(arg2); - if (len <= 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0"); RETURN_FALSE; @@ -1094,16 +1091,16 @@ Get a character from file pointer */ PHPAPI PHP_FUNCTION(fgetc) { - zval **arg1; + zval *arg1; char buf[2]; int result; php_stream *stream; - if (ZEND_NUM_ARGS() != 1 || ze
[PHP-CVS] cvs: php-src / run-tests.php
ohill Wed Jul 2 15:01:09 2008 UTC Modified files: /php-srcrun-tests.php Log: MFB: Fix parse error http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.358&r2=1.359&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.358 php-src/run-tests.php:1.359 --- php-src/run-tests.php:1.358 Wed Jul 2 12:46:48 2008 +++ php-src/run-tests.php Wed Jul 2 15:01:08 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.358 2008/07/02 12:46:48 pajoye Exp $ */ +/* $Id: run-tests.php,v 1.359 2008/07/02 15:01:08 ohill Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -445,7 +445,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.358 $' . "\n"; + echo '$Revision: 1.359 $' . "\n"; exit(1); default: echo "Illegal switch '$switch' specified!\n"; @@ -544,7 +544,7 @@ } } - if (substr(PHP_OS, 0, 3) != "WIN")) { + if (substr(PHP_OS, 0, 3) != "WIN") { $pass_options .= " -c " . escapeshellarg($conf_passed); } else { $pass_options .= " -c '$conf_passed'"; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
ohill Wed Jul 2 15:00:21 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: Fix parse error http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.27&r2=1.226.2.37.2.35.2.28&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.27 php-src/run-tests.php:1.226.2.37.2.35.2.28 --- php-src/run-tests.php:1.226.2.37.2.35.2.27 Wed Jul 2 12:47:06 2008 +++ php-src/run-tests.php Wed Jul 2 15:00:21 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.27 2008/07/02 12:47:06 pajoye Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.28 2008/07/02 15:00:21 ohill Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -447,7 +447,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.27 $'."\n"; + echo '$Revision: 1.226.2.37.2.35.2.28 $'."\n"; exit(1); case 'u': @@ -550,7 +550,7 @@ } if (strlen($conf_passed)) { - if (substr(PHP_OS, 0, 3) != "WIN")) { + if (substr(PHP_OS, 0, 3) != "WIN") { $pass_options .= " -c " . escapeshellarg($conf_passed); } else { $pass_options .= " -c '$conf_passed'"; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c /ext/standard/tests/strings chop_error.phpt chop_variation1.phpt chop_variation2.phpt chunk_split_variation1.phpt dirname_error.phpt explode1.ph
ohill Sun Jun 22 19:22:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard string.c /php-src/ext/standard/tests/strings chop_error.phpt chop_variation1.phpt chop_variation2.phpt chunk_split_variation1.phpt dirname_error.phpt explode1.phpt implode1.phpt join_error.phpt ltrim.phpt rtrim.phpt strpos.phpt strrchr_error.phpt strrchr_variation11.phpt strrchr_variation9.phpt trim1.phpt Log: New parameter parsing API for string, part I http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.22&r2=1.445.2.14.2.69.2.23&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.22 php-src/ext/standard/string.c:1.445.2.14.2.69.2.23 --- php-src/ext/standard/string.c:1.445.2.14.2.69.2.22 Tue May 27 10:29:33 2008 +++ php-src/ext/standard/string.c Sun Jun 22 19:22:41 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.445.2.14.2.69.2.22 2008/05/27 10:29:33 mattwil Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69.2.23 2008/06/22 19:22:41 ohill Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -182,16 +182,14 @@ Converts the binary representation of data to hex */ PHP_FUNCTION(bin2hex) { - zval **data; - char *result; - size_t newlen; + char *result, *data; + size_t newlen, datalen; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &data) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &datalen) == FAILURE) { + return; } - convert_to_string_ex(data); - result = php_bin2hex(Z_STRVAL_PP(data), Z_STRLEN_PP(data), &newlen); + result = php_bin2hex(data, datalen, &newlen); if (!result) { RETURN_FALSE; @@ -637,16 +635,15 @@ Compares two strings using the current locale */ PHP_FUNCTION(strcoll) { - zval **s1, **s2; - - if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) { - WRONG_PARAM_COUNT; + char *s1, *s2; + int s1len, s2len; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &s1, &s1len, &s2, &s2len) == FAILURE) { + return; } - convert_to_string_ex(s1); - convert_to_string_ex(s2); - RETURN_LONG(strcoll((const char *) Z_STRVAL_PP(s1), - (const char *) Z_STRVAL_PP(s2))); + RETURN_LONG(strcoll((const char *) s1, + (const char *) s2)); } /* }}} */ #endif @@ -752,22 +749,15 @@ */ static void php_do_trim(INTERNAL_FUNCTION_PARAMETERS, int mode) { - zval **str; - zval **what = NULL; - intargc = ZEND_NUM_ARGS(); - - if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &str, &what) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(str); - - if (argc > 1) { - convert_to_string_ex(what); - php_trim(Z_STRVAL_PP(str), Z_STRLEN_PP(str), Z_STRVAL_PP(what), Z_STRLEN_PP(what), return_value, mode TSRMLS_CC); - } else { - php_trim(Z_STRVAL_PP(str), Z_STRLEN_PP(str), NULL, 0, return_value, mode TSRMLS_CC); + char *str; + char *what = NULL; + int str_len, what_len = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &str, &str_len, &what, &what_len) == FAILURE) { + return; } + + php_trim(str, str_len, what, what_len, return_value, mode TSRMLS_CC); } /* }}} */ @@ -1010,18 +1000,14 @@ zval **str, **delim, **zlimit = NULL; int limit = -1; int argc = ZEND_NUM_ARGS(); - - if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &delim, &str, &zlimit) == FAILURE) { - WRONG_PARAM_COUNT; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ|l", &delim, &str, &limit) == FAILURE) { + return; } + convert_to_string_ex(str); convert_to_string_ex(delim); - if (argc > 2) { - convert_to_long_ex(zlimit); - limit = Z_LVAL_PP(zlimit); - } - if (! Z_STRLEN_PP(delim)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; @@ -1140,15 +1126,13 @@ PHP_FUNCTION(implode)
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var.c /ext/standard/tests/general_functions debug_zval_dump_e.phpt var_dump.phpt
ohill Fri Jun 20 18:05:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard var.c /php-src/ext/standard/tests/general_functions debug_zval_dump_e.phpt var_dump.phpt Log: - New parameter parsing API for var.c & tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.8&r2=1.203.2.7.2.18.2.9&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.8 php-src/ext/standard/var.c:1.203.2.7.2.18.2.9 --- php-src/ext/standard/var.c:1.203.2.7.2.18.2.8 Fri Jun 20 14:53:57 2008 +++ php-src/ext/standard/var.c Fri Jun 20 18:05:45 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: var.c,v 1.203.2.7.2.18.2.8 2008/06/20 14:53:57 felipe Exp $ */ +/* $Id: var.c,v 1.203.2.7.2.18.2.9 2008/06/20 18:05:45 ohill Exp $ */ /* {{{ includes */ @@ -172,12 +172,8 @@ int argc; int i; - argc = ZEND_NUM_ARGS(); - - args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0); - if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) { - efree(args); - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { + return; } for (i = 0; i < argc; i++) { @@ -328,12 +324,8 @@ int argc; int i; - argc = ZEND_NUM_ARGS(); - - args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0); - if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) { - efree(args); - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { + return; } for (i = 0; i < argc; i++) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt:1.1.2.1 Sat May 12 10:28:00 2007 +++ php-src/ext/standard/tests/general_functions/debug_zval_dump_e.phpt Fri Jun 20 18:05:45 2008 @@ -19,5 +19,5 @@ --EXPECTF-- *** Testing error conditions *** -Warning: Wrong parameter count for debug_zval_dump() in %s on line %d +Warning: debug_zval_dump() expects at least %d parameter, %d given in %s on line %d Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_dump.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/var_dump.phpt diff -u php-src/ext/standard/tests/general_functions/var_dump.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/general_functions/var_dump.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/general_functions/var_dump.phpt:1.1.2.2.2.1 Fri Nov 2 19:41:12 2007 +++ php-src/ext/standard/tests/general_functions/var_dump.phpt Fri Jun 20 18:05:45 2008 @@ -1907,5 +1907,5 @@ *** Testing error conditions *** -Warning: Wrong parameter count for var_dump() in %s on line %d +Warning: var_dump() expects at least %d parameter, %d given in %s on line %d Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php