[PHP-CVS] com php-src: fix test: ext/standard/tests/streams/bug61115-1.phpt
Commit:50bdc486855f450e733bc529ac0ce4f5f52ce405 Author:Stanislav Malyshev Sun, 25 Mar 2012 13:53:49 -0700 Parents: d51c1e0a4c86cca1dbdfb30dadd5b59db7e9eda1 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=50bdc486855f450e733bc529ac0ce4f5f52ce405 Log: fix test Changed paths: M ext/standard/tests/streams/bug61115-1.phpt Diff: 50bdc486855f450e733bc529ac0ce4f5f52ce405 diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 43c54b4..cfed64f 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp); ftruncate($fileResourceTemp, PHP_INT_MAX); ?> --EXPECTF-- -Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %s on line %d +Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix tests: ext/intl/tests/spoofchecker_001.phpt ext/intl/tests/spoofchecker_002.phpt ext/intl/tests/spoofchecker_003.phpt ext/intl/tests/spoofchecker_004.phpt ext/phar/tests/php
Commit:d51c1e0a4c86cca1dbdfb30dadd5b59db7e9eda1
Author:Stanislav Malyshev Sun, 25 Mar 2012 13:49:19
-0700
Parents: 2bd5fa0eda9a55b617b83ac3db6b8b7ca6190275
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d51c1e0a4c86cca1dbdfb30dadd5b59db7e9eda1
Log:
fix tests
Changed paths:
M ext/intl/tests/spoofchecker_001.phpt
M ext/intl/tests/spoofchecker_002.phpt
M ext/intl/tests/spoofchecker_003.phpt
M ext/intl/tests/spoofchecker_004.phpt
M ext/phar/tests/phpinfo_003.phpt
Diff:
d51c1e0a4c86cca1dbdfb30dadd5b59db7e9eda1
diff --git a/ext/intl/tests/spoofchecker_001.phpt
b/ext/intl/tests/spoofchecker_001.phpt
index 0b71de6..7904b3a 100755
--- a/ext/intl/tests/spoofchecker_001.phpt
+++ b/ext/intl/tests/spoofchecker_001.phpt
@@ -1,7 +1,7 @@
--TEST--
spoofchecker suspicious character checker
--SKIPIF--
-
+
--FILE--
+
--FILE--
areConfusable("hello, world", "he11o, wor1d"));
Checking if words are confusable
bool(false)
bool(true)
-bool(true)
\ No newline at end of file
+bool(true)
diff --git a/ext/intl/tests/spoofchecker_003.phpt
b/ext/intl/tests/spoofchecker_003.phpt
index 11a4f3f..0be9bfa 100755
--- a/ext/intl/tests/spoofchecker_003.phpt
+++ b/ext/intl/tests/spoofchecker_003.phpt
@@ -1,7 +1,7 @@
--TEST--
spoofchecker with locale settings
--SKIPIF--
-
+
--FILE--
isSuspicious($korean));
Is suspcious, en_US
bool(true)
Is suspcious, ko_KR
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/ext/intl/tests/spoofchecker_004.phpt
b/ext/intl/tests/spoofchecker_004.phpt
index dc57223..b38c61d 100755
--- a/ext/intl/tests/spoofchecker_004.phpt
+++ b/ext/intl/tests/spoofchecker_004.phpt
@@ -1,7 +1,7 @@
--TEST--
spoofchecker with settings changed
--SKIPIF--
-
+
--FILE--
enabled
Phar EXT version => %s
Phar API version => 1.1.1
-SVN revision => %cRevision: %s $
+SVN revision => %cId: %s $
Phar-based phar archives => enabled
Tar-based phar archives => enabled
ZIP-based phar archives => enabled
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pdo_mysql/mysql_statement.c
Hello!
Mail script show combined diff for merge commits:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7f05a39fce42029c126d6dc315ffdad43d27c8e9;hp=-c
It's diff between 3 revisions. (2 parents and 1 merge commit).
With regards, Alexander Moskaliov
ir...@irker.net
2012/3/25 Pierrick Charron :
> I looked at the git log/diff and I think there is a problem with the
> mailing system. It did not send the diff from the good parent for the merge.
>
> Pierrick
>
> On 24 March 2012 18:07, Pierrick Charron wrote:
>
>> Hmmm I think I have the same issue as Hannes. All those changes are not
>> the one I did on the 5.3 branch.
>> Any clue on how to deal with that ?
>>
>> Thanks
>> Pierrick
>>
>>
>> On 24 March 2012 17:59, Pierrick Charron wrote:
>>
>>> Commit: 7f05a39fce42029c126d6dc315ffdad43d27c8e9
>>> Author: Pierrick Charron Sat, 24 Mar 2012
>>> 17:59:46 -0400
>>> Parents: 10809686f0dbcbbf0eb06c968d65e0febe1dc034
>>> da2da13f935b2775635cd21b47a78fbf025a462d
>>> Branches: PHP-5.4 master
>>>
>>> Link:
>>> http://git.php.net/?p=php-src.git;a=commitdiff;h=7f05a39fce42029c126d6dc315ffdad43d27c8e9
>>>
>>> Log:
>>> Merge branch 'PHP-5.3' into PHP-5.4
>>>
>>> Changed paths:
>>> MM ext/pdo_mysql/mysql_statement.c
>>>
>>>
>>> Diff:
>>> 7f05a39fce42029c126d6dc315ffdad43d27c8e9
>>> diff --combined ext/pdo_mysql/mysql_statement.c
>>> index 20e67e4,115e74c..0c2689f
>>> --- a/ext/pdo_mysql/mysql_statement.c
>>> +++ b/ext/pdo_mysql/mysql_statement.c
>>> @@@ -59,10 -59,12 +59,10 @@@ static int pdo_mysql_stmt_dtor(pdo_stmt
>>> pefree(S->einfo.errmsg, stmt->dbh->is_persistent);
>>> S->einfo.errmsg = NULL;
>>> }
>>> -#if HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND
>>> if (S->stmt) {
>>> pdo_mysql_stmt_close(S->stmt);
>>> S->stmt = NULL;
>>> }
>>> -#endif /* HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND */
>>>
>>> #ifndef PDO_USE_MYSQLND
>>> if (S->params) {
>>> @@@ -75,6 -77,9 +75,6 @@@
>>> efree(S->in_length);
>>> }
>>>
>>> -#endif /* PDO_USE_MYSQLND */
>>> -
>>> -#ifdef HAVE_MYSQL_STMT_PREPARE
>>> if (S->bound_result)
>>> {
>>> int i;
>>> @@@ -86,9 -91,10 +86,9 @@@
>>> efree(S->out_null);
>>> efree(S->out_length);
>>> }
>>> -#endif /* HAVE_MYSQL_STMT_PREPARE */
>>> +#endif
>>>
>>>
>>> -#if HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND
>>> if (S->H->server) {
>>> while (mysql_more_results(S->H->server)) {
>>> MYSQL_RES *res;
>>> @@@ -101,8 -107,8 +101,8 @@@
>>> mysql_free_result(res);
>>> }
>>> }
>>> - }
>>> -#endif /* HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND */
>>> + }
>>> +
>>> #if PDO_USE_MYSQLND
>>> if (!S->stmt && S->current_data) {
>>> mnd_free(S->current_data);
>>> @@@ -158,7 -164,7 +158,7 @@@ static int pdo_mysql_fill_stmt_from_res
>>> }
>>> /* }}} */
>>>
>>> -#ifdef HAVE_MYSQL_STMT_PREPARE
>>> +#ifndef PDO_USE_MYSQLND
>>> static int pdo_mysql_stmt_execute_prepared_libmysql(pdo_stmt_t *stmt
>>> TSRMLS_DC) /* {{{ */
>>> {
>>> pdo_mysql_stmt *S = stmt->driver_data;
>>> @@@ -316,13 -322,14 +316,12 @@@ static int pdo_mysql_stmt_execute(pdo_s
>>> {
>>> pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
>>> pdo_mysql_db_handle *H = S->H;
>>> PDO_DBG_ENTER("pdo_mysql_stmt_execute");
>>> PDO_DBG_INF_FMT("stmt=%p", S->stmt);
>>>
>>> if (S->stmt) {
>>> PDO_DBG_RETURN(pdo_mysql_stmt_execute_prepared(stmt));
>>> }
>>> -#endif
>>>
>>> /* ensure that we free any previous unfetched results */
>>> if (S->result) {
>>> @@@ -341,6 -348,7 +340,6 @@@
>>>
>>> static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{
>>> */
>>> {
>>> -#if HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND
>>> pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
>>> pdo_mysql_db_handle *H = S->H;
>>> long row_count;
>>> @@@ -402,7 -410,7 +401,7 @@@
>>> #endif
>>>
>>> /* ensure that we free any previous unfetched results */
>>> -#if HAVE_MYSQL_STMT_PREPARE
>>> +#ifndef PDO_USE_MYSQLND
>>> if (S->stmt) {
>>> stmt->column_count = (int)mysql_num_fields(S->result);
>>> mysql_stmt_free_result(S->stmt);
>>> @@@ -424,6 -432,10 +423,6 @@@
>>> } else {
>>> PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt
>>> TSRMLS_CC));
>>> }
>>> -#else
>>> - strcpy(stmt->error_code, "HYC00");
>>> - PDO_DBG_RETURN(0);
>>> -#endif /* HAVE_MYSQL_STMT_PREPARE */
>>> }
>>> /* }}} */
>>>
>>> @@@ -445,6 -457,7 +444,6 @@@ static int pdo_mysql_stmt_param_hook(pd
>>> #ifndef PDO_USE_MYSQLND
>>> PDO_MYSQL_PARAM_BIND *b;
>>> #endif
>>> -#if HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND
>>> pdo_mysql_stmt *S = (pdo_mysql_stmt*)st
[PHP-CVS] com php-src: fix bug #61487 - bad bounds check in grapheme_strpos: ext/intl/grapheme/grapheme_util.h ext/intl/tests/bug61487.phpt
Commit:cd9cd36d7e81af19eba3631b371ec40658874a8b Author:Stanislav Malyshev Fri, 23 Mar 2012 00:26:33 -0700 Parents: da2da13f935b2775635cd21b47a78fbf025a462d Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cd9cd36d7e81af19eba3631b371ec40658874a8b Log: fix bug #61487 - bad bounds check in grapheme_strpos Bugs: https://bugs.php.net/61487 Changed paths: M ext/intl/grapheme/grapheme_util.h A ext/intl/tests/bug61487.phpt Diff: cd9cd36d7e81af19eba3631b371ec40658874a8b diff --git a/ext/intl/grapheme/grapheme_util.h b/ext/intl/grapheme/grapheme_util.h index 675c648..c91aeaf 100755 --- a/ext/intl/grapheme/grapheme_util.h +++ b/ext/intl/grapheme/grapheme_util.h @@ -54,6 +54,6 @@ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC ); /* OUTSIDE_STRING: check if (possibly negative) long offset is outside the string with int32_t length */ -#define OUTSIDE_STRING(offset, max_len) ( offset < INT32_MIN || offset > INT32_MAX || (offset < 0 ? -offset > (long) max_len : offset >= (long) max_len) ) +#define OUTSIDE_STRING(offset, max_len) ( offset <= INT32_MIN || offset > INT32_MAX || (offset < 0 ? -offset > (long) max_len : offset >= (long) max_len) ) #endif // GRAPHEME_GRAPHEME_UTIL_H diff --git a/ext/intl/tests/bug61487.phpt b/ext/intl/tests/bug61487.phpt new file mode 100644 index 000..361debe --- /dev/null +++ b/ext/intl/tests/bug61487.phpt @@ -0,0 +1,11 @@ +--TEST-- +grapheme() str[i]pos limits +--SKIPIF-- + +--FILE-- +http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for bug #61487: NEWS
Commit:cdfef0aee4498e500d799c3e725abe8e95dba774 Author:Stanislav Malyshev Sun, 25 Mar 2012 01:00:06 -0700 Parents: a635b0d2fc7dd970fc1fd525bc11d4194ec23e0a Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cdfef0aee4498e500d799c3e725abe8e95dba774 Log: NEWS for bug #61487 Bugs: https://bugs.php.net/61487 Changed paths: M NEWS Diff: cdfef0aee4498e500d799c3e725abe8e95dba774 diff --git a/NEWS b/NEWS index 7853ad6..6fc9126 100644 --- a/NEWS +++ b/NEWS @@ -51,6 +51,10 @@ PHP NEWS - Installation . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) +- Intl: + . Fixed bug #61487 (Incorrent bounds checking in grapheme_strpos). +(Stas) + - mbstring: . MFH mb_ereg_replace_callback() for security enhancements. (Rui) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for bug #61487: NEWS
Commit:4c478f9ca698c2f990a521b084281bdd01b02d02 Author:Stanislav Malyshev Sun, 25 Mar 2012 00:57:08 -0700 Parents: da2da13f935b2775635cd21b47a78fbf025a462d Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4c478f9ca698c2f990a521b084281bdd01b02d02 Log: NEWS for bug #61487 Bugs: https://bugs.php.net/61487 Changed paths: M NEWS Diff: 4c478f9ca698c2f990a521b084281bdd01b02d02 diff --git a/NEWS b/NEWS index d278883..abda82a 100644 --- a/NEWS +++ b/NEWS @@ -252,6 +252,8 @@ PHP NEWS for small images). (Florian) - Intl: + . Fixed bug #61487 (Incorrent bounds checking in grapheme_strpos). +(Stas) . Fixed bug #60192 (SegFault when Collator not constructed properly). (Florian) . Fixed memory leak in several Intl locale functions. (Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
