[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
On Tue, 5 Aug 2008, Olivier Hill wrote: 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? Looks fine - I missed your patch on the list though. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- 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
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] -- 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
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
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
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 -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- 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
On Wed, 25 Jun 2008, Olivier Hill wrote:
ohill Wed Jun 25 12:16:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
snip
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--TEST--
parse_str() with empty query string
--FILE--
?php
parse_str( , $p ); var_dump( $p );
?
--EXPECT--
array(0) {
}
--
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
snip
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
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
On 30.06.2008 14:39, Antony Dovgal wrote: tony2001Mon Jun 30 10:39:35 2008 UTC Added files: (Branch: PHP_5_3) /pecl/sdo/SCA/Bindings/atom Atom1.0.xsd xhtml1-strict.xsd ServiceRequestHandler.php Proxy.php .cvsignore xml.xsd AtomDas.php RequestTester.php SCA_AtomServer.php SCA_ServiceWrapperAtom.php Atom1.0.xsd ServiceRequestHandler.php SCA_AtomServer.php SCA_ServiceWrapperAtom.php AtomDas.php RequestTester.php .cvsignore xml.xsd xhtml1-strict.xsd Proxy.php WTH?! Since when cvs ci ext/standard/string.c modifies something else than ext/standard/string.c ? Here is full error log I received: --- COMMITINFO /repository/php-src/ext/standard string.c Checking in ext/standard/string.c; /repository/php-src/ext/standard/string.c,v -- string.c new revision: 1.445.2.14.2.69.2.27; previous revision: 1.445.2.14.2.69.2.26 done 42862 LOGINFO php-cvs@lists.php.net tony2001 php-src/ext/standard string.c,1.445.2.14.2.69.2.26,1.445.2.14.2.69.2.27 Use of uninitialized value in string eq at /repository/CVSROOT/loginfo.pl line 127, FC line 11. Use of uninitialized value in string eq at /repository/CVSROOT/loginfo.pl line 127, FC line 11. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 152. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 152. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 153. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 153. cvs rdiff: cannot find module `pecl/sdo/SCA/Bindings/atom/binding' - ignored 42863 Mailing the commit email to php-cvs@lists.php.net -- Wbr, Antony Dovgal -- 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
Ilia, the tests are still broken.
On 25.01.2008 04:31, Ilia Alshanetsky wrote:
iliaa Fri Jan 25 01:31:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
Adjust new chr() param handling to address chr() calls
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.12r2=1.445.2.14.2.69.2.13diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.12
php-src/ext/standard/string.c:1.445.2.14.2.69.2.13
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.12Tue Jan 22
01:34:24 2008
+++ php-src/ext/standard/string.c Fri Jan 25 01:31:10 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.12 2008/01/22 01:34:24 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.13 2008/01/25 01:31:10 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2604,9 +2604,14 @@
long c;
char temp[2];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, c) ==
FAILURE) {
- return;
+ if (ZEND_NUM_ARGS() != 1) {
+ WRONG_PARAM_COUNT;
}
+
+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, l, c) == FAILURE) {
+ c = 0;
+ }
+
temp[0] = (char)c;
temp[1] = '\0';
--
Wbr,
Antony Dovgal
--
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
On Jan 25, 2008 2:31 AM, Ilia Alshanetsky [EMAIL PROTECTED] wrote:
iliaa Fri Jan 25 01:31:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
Adjust new chr() param handling to address chr() calls
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.12r2=1.445.2.14.2.69.2.13diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.12
php-src/ext/standard/string.c:1.445.2.14.2.69.2.13
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.12 Tue Jan 22 01:34:24
2008
+++ php-src/ext/standard/string.c Fri Jan 25 01:31:10 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.12 2008/01/22 01:34:24 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.13 2008/01/25 01:31:10 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2604,9 +2604,14 @@
long c;
char temp[2];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, c) ==
FAILURE) {
- return;
+ if (ZEND_NUM_ARGS() != 1) {
+ WRONG_PARAM_COUNT;
}
+
+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, l, c) == FAILURE) {
+ c = 0;
+ }
This definitely looks wrong. If I pass an object or whatever it won't
throw any errors.
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
