diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsfns.m | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index fe565a423aa..5ae2cc77bb2 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -3829,11 +3829,7 @@ all_nonzero_ascii (unsigned char *str, ptrdiff_t n) | |||
| 3829 | /* Make a Lisp string from an NSString. */ | 3829 | /* Make a Lisp string from an NSString. */ |
| 3830 | - (Lisp_Object)lispString | 3830 | - (Lisp_Object)lispString |
| 3831 | { | 3831 | { |
| 3832 | /* `make_string' creates a string with a given length, instead of | 3832 | // make_string behaves predictably and correctly with UTF-8 input. |
| 3833 | searching for a trailing NULL byte to determine its end. This is | ||
| 3834 | important because this function is called to convert NSString | ||
| 3835 | objects containing clipboard data, which can contain NUL bytes, | ||
| 3836 | into Lisp strings. (bug#64697) */ | ||
| 3837 | return make_string ([self UTF8String], | 3833 | return make_string ([self UTF8String], |
| 3838 | [self lengthOfBytesUsingEncoding: NSUTF8StringEncoding]); | 3834 | [self lengthOfBytesUsingEncoding: NSUTF8StringEncoding]); |
| 3839 | } | 3835 | } |