Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Unreleased
- Fix `EXC_BAD_ACCESS` crash in `GDTCORLogAssert` when a user's project path contains `%` characters. ([#16455](https://github.com/firebase/firebase-ios-sdk/issues/16455))
- Cancel upload operation when background task expires.
- Log error when handling directory enumeration.

Expand Down
15 changes: 8 additions & 7 deletions GoogleDataTransport/GDTCORLibrary/GDTCORConsoleLogger.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ void GDTCORLog(GDTCORMessageCode code, GDTCORLoggingLevel logLevel, NSString *fo
// Don't log anything in not debug builds.
#if !NDEBUG
if (logLevel >= GDTCORConsoleLoggerLoggingLevel) {
NSString *logFormat = [NSString stringWithFormat:@"%@[%@] %@", kGDTCORConsoleLogger,
GDTCORMessageCodeEnumToString(code), format];
va_list args;
va_start(args, format);
NSLogv(logFormat, args);
NSString *message = format ? [[NSString alloc] initWithFormat:format arguments:args] : @"";
va_end(args);

NSLog(@"%@[%@] %@", kGDTCORConsoleLogger, GDTCORMessageCodeEnumToString(code), message);
}
#endif // !NDEBUG
}
Expand All @@ -44,12 +44,13 @@ void GDTCORLogAssert(
// Don't log anything in not debug builds.
#if !NDEBUG
GDTCORMessageCode code = wasFatal ? GDTCORMCEFatalAssertion : GDTCORMCEGeneralError;
NSString *logFormat =
[NSString stringWithFormat:@"%@[%@] (%@:%ld) : %@", kGDTCORConsoleLogger,
GDTCORMessageCodeEnumToString(code), file, (long)line, format];

va_list args;
va_start(args, format);
NSLogv(logFormat, args);
NSString *message = format ? [[NSString alloc] initWithFormat:format arguments:args] : @"";
va_end(args);

NSLog(@"%@[%@] (%@:%ld) : %@", kGDTCORConsoleLogger, GDTCORMessageCodeEnumToString(code), file,
(long)line, message);
#endif // !NDEBUG
}
Loading