diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-25 13:05:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-25 13:05:08 +0800 |
| commit | fe0ca2745f00940a27bfc8e87db534541a19af70 (patch) | |
| tree | 9f6ecb6d7dd517f46f71bfc12cdeebd17f8fc904 /ext/json/json.c | |
| parent | ef2db26c60537e84b502608ff404263d5f4dc5d2 (diff) | |
| parent | 968fbc6acf0bc27be17c0209be7f966e89a55943 (diff) | |
| download | php-git-fe0ca2745f00940a27bfc8e87db534541a19af70.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
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 b3240e1b4b..87de49cb8c 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -368,7 +368,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) { |