Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various leaks in Foundation v2 #1873

Merged
merged 1 commit into from
Jan 31, 2017
Merged

Fix various leaks in Foundation v2 #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Frameworks/Foundation/NSLog.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 10 additions & 5 deletions Frameworks/Foundation/NSLogging.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion Frameworks/Foundation/NSMutableString.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
3 changes: 2 additions & 1 deletion Frameworks/Foundation/NSString.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}

Expand Down
2 changes: 1 addition & 1 deletion Frameworks/Foundation/NSTimer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down