From 69912114ee23c183fbd688d045d5f9e6f591153f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 8 Aug 2019 20:46:25 +0100
Subject: [PATCH] fix osx clipboard string encoding.

---
 native/Avalonia.Native/src/OSX/AvnString.mm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnString.mm b/native/Avalonia.Native/src/OSX/AvnString.mm
index b491cf2a92..9fb6101438 100644
--- a/native/Avalonia.Native/src/OSX/AvnString.mm
+++ b/native/Avalonia.Native/src/OSX/AvnString.mm
@@ -12,6 +12,7 @@ class AvnStringImpl : public virtual ComSingleObject<IAvnString, &IID_IAvnString
 {
 private:
     NSString* _string;
+    const char* _cstring;
     
 public:
     FORWARD_IUNKNOWN()
@@ -19,6 +20,7 @@ public:
     AvnStringImpl(NSString* string)
     {
         _string = string;
+        _cstring = [_string cStringUsingEncoding:NSUTF8StringEncoding];
     }
     
     virtual HRESULT Pointer(void**retOut) override
@@ -30,7 +32,7 @@ public:
                 return E_POINTER;
             }
             
-            *retOut = (void*)_string.UTF8String;
+            *retOut = (void*)_cstring;
             
             return S_OK;
         }
@@ -43,7 +45,7 @@ public:
             return E_POINTER;
         }
         
-        *retOut = (int)_string.length;
+        *retOut = (int)[_string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
         
         return S_OK;
     }