Fix various leaks in Foundation (#1834)

Thanks to @ehren.
microsoft · Jan 26, 2017 · 3a65494 · 3a65494
1 parent 8185374
commit 3a65494
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/Frameworks/Foundation/NSLog.mm b/Frameworks/Foundation/NSLog.mm
@@ -27,7 +27,8 @@
  @Status Interoperable
 */
 void NSLogv(NSString* format, va_list list) {
-    StrongId<NSString> formattedString = [[NSString alloc] initWithFormat:format arguments:list];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:format arguments:list]);
     std::wstring wideBuffer = Strings::NarrowToWide<std::wstring>(formattedString);
 
     // This traces to ETW in debug and release modes.

diff --git a/Frameworks/Foundation/NSLogging.mm b/Frameworks/Foundation/NSLogging.mm
@@ -24,7 +24,8 @@
 void NSTraceVerbose(const wchar_t* tag, NSString* format, ...) {
     va_list list;
     va_start(list, format);
-    StrongId<NSString> formattedString = [[NSString alloc] initWithFormat:format arguments:list];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:format arguments:list]);
     std::wstring wideBuffer = Strings::NarrowToWide<std::wstring>(formattedString);
     TraceVerbose(tag, g_TraceFormat, wideBuffer.c_str());
     va_end(list);
@@ -33,7 +34,8 @@ void NSTraceVerbose(const wchar_t* tag, NSString* format, ...) {
 void NSTraceInfo(const wchar_t* tag, NSString* format, ...) {
     va_list list;
     va_start(list, format);
-    StrongId<NSString> formattedString = [[NSString alloc] initWithFormat:format arguments:list];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:format arguments:list]);
     std::wstring wideBuffer = Strings::NarrowToWide<std::wstring>(formattedString);
     TraceInfo(tag, g_TraceFormat, wideBuffer.c_str());
     va_end(list);
@@ -42,7 +44,8 @@ void NSTraceInfo(const wchar_t* tag, NSString* format, ...) {
 void NSTraceWarning(const wchar_t* tag, NSString* format, ...) {
     va_list list;
     va_start(list, format);
-    StrongId<NSString> formattedString = [[NSString alloc] initWithFormat:format arguments:list];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:format arguments:list]);
     std::wstring wideBuffer = Strings::NarrowToWide<std::wstring>(formattedString);
     TraceWarning(tag, g_TraceFormat, wideBuffer.c_str());
     va_end(list);
@@ -51,7 +54,8 @@ void NSTraceWarning(const wchar_t* tag, NSString* format, ...) {
 void NSTraceError(const wchar_t* tag, NSString* format, ...) {
     va_list list;
     va_start(list, format);
-    StrongId<NSString> formattedString = [[NSString alloc] initWithFormat:format arguments:list];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:format arguments:list]);
     std::wstring wideBuffer = Strings::NarrowToWide<std::wstring>(formattedString);
     TraceError(tag, g_TraceFormat, wideBuffer.c_str());
     va_end(list);
@@ -60,7 +64,8 @@ void NSTraceError(const wchar_t* tag, NSString* format, ...) {
 void NSTraceCritical(const wchar_t* tag, NSString* format, ...) {
     va_list list;
     va_start(list, format);
-    StrongId<NSString> formattedString = [[NSString alloc] initWithFormat:format arguments:list];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:format arguments:list]);
     std::wstring wideBuffer = Strings::NarrowToWide<std::wstring>(formattedString);
     TraceCritical(tag, g_TraceFormat, wideBuffer.c_str());
     va_end(list);

diff --git a/Frameworks/Foundation/NSMutableString.mm b/Frameworks/Foundation/NSMutableString.mm
@@ -97,7 +97,8 @@ - (void)appendFormat:(NSString*)formatStr, ... {
     va_list reader;
     va_start(reader, formatStr);
 
-    NSString* endStr = [[NSString alloc] initWithFormat:formatStr arguments:reader];
+    StrongId<NSString> endStr;
+    endStr.attach([[NSString alloc] initWithFormat:formatStr arguments:reader]);
     va_end(reader);
 
     [self appendString:endStr];

diff --git a/Frameworks/Foundation/NSString.mm b/Frameworks/Foundation/NSString.mm
@@ -110,7 +110,8 @@ - (NSString*)stringByAppendingFormat:(NSString*)formatStr, ... {
     va_list reader;
     va_start(reader, formatStr);
 
-    NSString* formattedString = [[NSString alloc] initWithFormat:formatStr arguments:reader];
+    StrongId<NSString> formattedString;
+    formattedString.attach([[NSString alloc] initWithFormat:formatStr arguments:reader]);
     return [self stringByAppendingString:formattedString];
 }
 

diff --git a/Frameworks/Foundation/NSThread.mm b/Frameworks/Foundation/NSThread.mm
@@ -356,7 +356,7 @@ + (NSThread*)currentThread {
     NSThread* currentThread = [[self class] _threadObjectFromCurrentThread];
 
     if (currentThread == nil) {
-        currentThread = [NSThread new];
+        currentThread = [[[NSThread alloc] init] autorelease];
         [currentThread _associateWithCurrentThread];
     }
     return currentThread;

diff --git a/Frameworks/Foundation/NSTimer.mm b/Frameworks/Foundation/NSTimer.mm
@@ -183,7 +183,7 @@ - (instancetype)initWithTimeInterval:(double)seconds
         _repeats = repeats;
         _canFire = YES;
         _valid = YES;
-        _addedToModes = (NSMutableArray*)CFArrayCreateMutable(NULL, 0, NULL);
+        _addedToModes.attach((NSMutableArray*)CFArrayCreateMutable(NULL, 0, NULL));
         _nextFireTime = [NSDate timeIntervalSinceReferenceDate] + _interval;
     }