diff options
| author | Anatol Belski <ab@php.net> | 2018-02-05 20:27:52 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-02-05 20:42:17 +0100 |
| commit | dd4afad087eaa35cca73201dbd5f50db2be05bac (patch) | |
| tree | 1460b2c6447e0eec8dbe0d335636ea8eb9243629 | |
| parent | 7a4573a55ad244b66c40b4086e432775b6f185b7 (diff) | |
| download | php-git-dd4afad087eaa35cca73201dbd5f50db2be05bac.tar.gz | |
Fix visibility
| -rw-r--r-- | win32/codepage.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/codepage.c b/win32/codepage.c index 7143fb3c75..773df129d2 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -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++; |