delta/php-git.git/ext/mbstring, branch php-5.5.0 git.php.net: repository/php-src.git Merge branch 'pull-request/341' 2013-06-10T21:30:59+00:00 Stanislav Malyshev stas@php.net 2013-06-10T21:20:18+00:00 02e4d7a290ae437688b3a3d114621a1d32444560 * pull-request/341: (23 commits) typofixes 
* pull-request/341: (23 commits)
  typofixes
Merge branch 'PHP-5.4' into PHP-5.5 2013-05-09T07:57:44+00:00 Xinchen Hui laruence@php.net 2013-05-09T07:57:44+00:00 b3f6cc20e009e04695b6ce761222283c5af4dcdb 






Missed SKIPIF
2013-05-09T07:57:25+00:00

Xinchen Hui
laruence@php.net

2013-05-09T07:57:25+00:00

699dc04c5597a6dbd5d4fac43096d01ea37e6069












Fixed bug #64769 mbstring PHPTs crash on Windows x64
2013-05-08T17:22:37+00:00

Anatol Belski
ab@php.net

2013-05-08T16:58:32+00:00

4091e946606deaf2f8d909e20701bdb832996074

The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859





The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859







Merge branch 'PHP-5.4' into PHP-5.5
2013-02-16T14:29:14+00:00

Xinchen Hui
laruence@php.net

2013-02-16T14:29:14+00:00

69b80a93defc23ac3bc9b7e58c04628cc2765f7e












Fix test failed after 0ea83ff8478d867ebf1603a43cd5d3432022cee7
2013-02-16T14:28:28+00:00

Xinchen Hui
laruence@php.net

2013-02-16T14:28:28+00:00

375e3c273b5219e9937c179ed59d551fdce4e540












mb_split() can now handle empty matches like preg_split() does.
2013-02-10T06:05:17+00:00

Moriyoshi Koizumi
mozo@mozo.jp

2013-02-10T06:04:23+00:00

20eb33b3212bd6c17d73c569c7345ae23c04d3ef












mb_split() can now handle empty matches like preg_split() does.
2013-02-10T06:04:23+00:00

Moriyoshi Koizumi
mozo@mozo.jp

2013-02-10T06:04:23+00:00

0ea83ff8478d867ebf1603a43cd5d3432022cee7












Happy New Year
2013-01-01T08:37:09+00:00

Xinchen Hui
laruence@php.net

2013-01-01T08:37:09+00:00

a666285bc2488b7f7362368c388e41428610ad1d












Happy New Year
2013-01-01T08:28:54+00:00

Xinchen Hui
laruence@php.net

2013-01-01T08:28:54+00:00

0a7395e009b2df94c2a3f05aef69fb1779edf8f8