mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win32: support for UTF-16 surrogate pairs (ticket #457).

Browse Source
This commit is contained in:
Maxim Dounin 2014-01-04 03:32:15 +04:00
parent def37d254a
commit eb60e1e26d
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/os/win32/ngx_files.c
View File

@ -799,13 +799,25 @@ ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len)
continue; continue;
} }
if (u + 1 == last) {
*len = u - utf16;
break;
}
n = ngx_utf8_decode(&p, 4); n = ngx_utf8_decode(&p, 4);
if (n > 0xffff) { if (n > 0x10ffff) {
ngx_set_errno(NGX_EILSEQ); ngx_set_errno(NGX_EILSEQ);
return NULL; return NULL;
} }
if (n > 0xffff) {
n -= 0x10000;
*u++ = (u_short) (0xd800 + (n >> 10));
*u++ = (u_short) (0xdc00 + (n & 0x03ff));
continue;
}
*u++ = (u_short) n; *u++ = (u_short) n;
} }
@ -838,12 +850,19 @@ ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len)
n = ngx_utf8_decode(&p, 4); n = ngx_utf8_decode(&p, 4);
if (n > 0xffff) { if (n > 0x10ffff) {
free(utf16); free(utf16);
ngx_set_errno(NGX_EILSEQ); ngx_set_errno(NGX_EILSEQ);
return NULL; return NULL;
} }
if (n > 0xffff) {
n -= 0x10000;
*u++ = (u_short) (0xd800 + (n >> 10));
*u++ = (u_short) (0xdc00 + (n & 0x03ff));
continue;
}
*u++ = (u_short) n; *u++ = (u_short) n;
} }