diff options
| author | Paul Eggert | 2011-05-27 12:37:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-27 12:37:32 -0700 |
| commit | 0f6990a78ae5016d8ae73253cdb4739adf0197e7 (patch) | |
| tree | 78c7860e14d7cf6bc73526174493a02e606dfc13 /src/fns.c | |
| parent | fb1ac845caea7da6ba98b93c3d67fa67c651b8ef (diff) | |
| parent | b57f7e0a357aacf98ec5be826f7227f37e9806b8 (diff) | |
| download | emacs-0f6990a78ae5016d8ae73253cdb4739adf0197e7.tar.gz emacs-0f6990a78ae5016d8ae73253cdb4739adf0197e7.zip | |
Merge: Integer overflow fixes.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -898,7 +898,7 @@ string_to_multibyte (Lisp_Object string) | |||
| 898 | if (STRING_MULTIBYTE (string)) | 898 | if (STRING_MULTIBYTE (string)) |
| 899 | return string; | 899 | return string; |
| 900 | 900 | ||
| 901 | nbytes = parse_str_to_multibyte (SDATA (string), SBYTES (string)); | 901 | nbytes = count_size_as_multibyte (SDATA (string), SBYTES (string)); |
| 902 | /* If all the chars are ASCII, they won't need any more bytes once | 902 | /* If all the chars are ASCII, they won't need any more bytes once |
| 903 | converted. */ | 903 | converted. */ |
| 904 | if (nbytes == SBYTES (string)) | 904 | if (nbytes == SBYTES (string)) |