From 1d665c55f96dc541b06e350b017484ef56aeb385 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 3 Dec 2021 16:02:03 +0100 Subject: [PATCH] Fix leak in GetNSStringAndRelease. --- native/Avalonia.Native/src/OSX/AvnString.mm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/AvnString.mm b/native/Avalonia.Native/src/OSX/AvnString.mm index e0266a127c..5e50068c51 100644 --- a/native/Avalonia.Native/src/OSX/AvnString.mm +++ b/native/Avalonia.Native/src/OSX/AvnString.mm @@ -156,17 +156,16 @@ IAvnString* CreateByteArray(void* data, int len) NSString* GetNSStringAndRelease(IAvnString* s) { + NSString* result = nil; + if (s != nullptr) { char* p; - if (s->Pointer((void**)&p) == S_OK && p != nullptr) - { - return [NSString stringWithUTF8String:p]; - } + result = [NSString stringWithUTF8String:p]; s->Release(); } - return nullptr; + return result; }