archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix visibility

Browse source
This commit is contained in:
Anatol Belski 2018-02-05 20:27:52 +01:00
parent 7a4573a55a
commit dd4afad087
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
win32/codepage.c
View file

@ -102,7 +102,7 @@ PW32CP wchar_t *php_win32_cp_conv_to_w(DWORD cp, DWORD flags, const char* in, si
PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size_t *out_len)
{/*{{{*/
wchar_t *ret, *ret_idx;
const char *idx = in, *end, *aidx;
const char *idx = in, *end;
assert(in && in_len ? in[in_len] == '\0' : 1);
@ -115,9 +115,10 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size
}
end = in + in_len;
aidx = (const char *)ZEND_SLIDE_TO_ALIGNED16(in);
if (in_len > 15) {
const char *aidx = (const char *)ZEND_SLIDE_TO_ALIGNED16(in);
/* Process unaligned chunk. */
while (idx < aidx) {
if (!__isascii(*idx) && '\0' != *idx) {
@ -157,6 +158,8 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size
be more expencive, if a non ASCII string was passed.
TODO check wether the impact is acceptable. */
if (in_len > 15) {
const char *aidx = (const char *)ZEND_SLIDE_TO_ALIGNED16(in);
/* Process unaligned chunk. */
while (idx < aidx) {
*ret_idx++ = (wchar_t)*idx++;