diff options
| author | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
| commit | b16929ca7294fb047e63eb6c04d715d980a50c47 (patch) | |
| tree | e8ccc6acd38dbf670380cccc500100279d74f53d /ext/json/json.c | |
| parent | bba16dde5ded45802543712bb3b9fe6e93b10751 (diff) | |
| parent | 9266227402f50e1ad9953952b68a5ff3a25806b0 (diff) | |
| download | php-git-b16929ca7294fb047e63eb6c04d715d980a50c47.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 6b66dce3df..b7ea5ec54f 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -382,7 +382,7 @@ static int json_utf8_to_utf16(unsigned short *utf16, char utf8[], int len) /* {{ } } } else { - /* Only check if utf8 string is valid, and compute utf16 lenght */ + /* Only check if utf8 string is valid, and compute utf16 length */ for (j=0 ; pos < len ; j++) { us = php_next_utf8_char((const unsigned char *)utf8, len, &pos, &status); if (status != SUCCESS) { |