[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103021: Handle nul-character in copy
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103021: Handle nul-character in copy/paste (Bug#7934). |
Date: |
Sat, 29 Jan 2011 12:30:11 +0100 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103021
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-29 12:30:11 +0100
message:
Handle nul-character in copy/paste (Bug#7934).
* nsselect.m (ns_string_from_pasteboard): Get length of string
and use make_string instead of build_string.
(ns_string_to_pasteboard_internal): Use initWithBytesNoCopy
instead of stringWithUTF8String (Bug#7934).
modified:
src/ChangeLog
src/nsselect.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-01-29 10:36:16 +0000
+++ b/src/ChangeLog 2011-01-29 11:30:11 +0000
@@ -1,3 +1,10 @@
+2011-01-29 Jan Djärv <address@hidden>
+
+ * nsselect.m (ns_string_from_pasteboard): Get length of string
+ and use make_string instead of build_string (Bug#7934).
+ (ns_string_to_pasteboard_internal): Use initWithBytesNoCopy
+ instead of stringWithUTF8String (Bug#7934).
+
2011-01-29 Anders Lindgren <address@hidden> (tiny change)
* nsfont.m (nsfont_open): Ensure that fonts with inexact
=== modified file 'src/nsselect.m'
--- a/src/nsselect.m 2011-01-25 04:08:28 +0000
+++ b/src/nsselect.m 2011-01-29 11:30:11 +0000
@@ -153,8 +153,10 @@
CHECK_STRING (str);
utfStr = SDATA (str);
- nsStr = [NSString stringWithUTF8String: utfStr];
-
+ nsStr = [[NSString alloc] initWithBytesNoCopy: utfStr
+ length: SBYTES (str)
+ encoding: NSUTF8StringEncoding
+ freeWhenDone: NO];
if (gtype == nil)
{
[pb declareTypes: ns_send_types owner: nil];
@@ -166,6 +168,7 @@
{
[pb setString: nsStr forType: gtype];
}
+ [nsStr release];
}
}
@@ -303,6 +306,7 @@
{
NSString *type, *str;
const char *utfStr;
+ int length;
type = [pb availableTypeFromArray: ns_return_types];
if (type == nil)
@@ -344,17 +348,23 @@
options: NSLiteralSearch range: NSMakeRange (0, [mstr length])];
utfStr = [mstr UTF8String];
- if (!utfStr)
- utfStr = [mstr cString];
+ length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding];
+
+ if (!utfStr)
+ {
+ utfStr = [mstr cString];
+ length = strlen (utfStr);
+ }
}
NS_HANDLER
{
message1 ("ns_string_from_pasteboard: UTF8String failed\n");
utfStr = [str lossyCString];
+ length = strlen (utfStr);
}
NS_ENDHANDLER
- return build_string (utfStr);
+ return make_string (utfStr, length);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103021: Handle nul-character in copy/paste (Bug#7934).,
Jan D. <=