Skip to content

Commit 00be38c

Browse files
authored
Don't allow logger version deallocation (#6719)
1 parent f198987 commit 00be38c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

FirebaseCore/Sources/FIRLogger.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
void FIRLoggerInitializeASL() {
5959
dispatch_once(&sFIRLoggerOnceToken, ^{
6060
// Register Firebase Version with GULLogger.
61-
GULLoggerRegisterVersion([FIRFirebaseVersion() UTF8String]);
61+
GULLoggerRegisterVersion(FIRFirebaseVersion());
6262

6363
// Override the aslOptions to ASL_OPT_STDERR if the override argument is passed in.
6464
NSArray *arguments = [NSProcessInfo processInfo].arguments;

GoogleUtilities/Logger/GULLogger.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
static GULLoggerLevel sGULLoggerMaximumLevel;
3434

3535
// Allow clients to register a version to include in the log.
36-
static const char *sVersion = "";
36+
static NSString *sVersion = @"";
3737

3838
static GULLoggerService kGULLoggerLogger = @"[GULLogger]";
3939

@@ -139,7 +139,7 @@ BOOL getGULLoggerDebugMode() {
139139
}
140140
#endif
141141

142-
void GULLoggerRegisterVersion(const char *version) {
142+
void GULLoggerRegisterVersion(NSString *version) {
143143
sVersion = version;
144144
}
145145

@@ -168,7 +168,7 @@ void GULLogBasic(GULLoggerLevel level,
168168
} else {
169169
logMsg = [[NSString alloc] initWithFormat:message arguments:args_ptr];
170170
}
171-
logMsg = [NSString stringWithFormat:@"%s - %@[%@] %@", sVersion, service, messageCode, logMsg];
171+
logMsg = [NSString stringWithFormat:@"%@ - %@[%@] %@", sVersion, service, messageCode, logMsg];
172172
dispatch_async(sGULClientQueue, ^{
173173
asl_log(sGULLoggerClient, NULL, (int)level, "%s", logMsg.UTF8String);
174174
});

GoogleUtilities/Logger/Public/GoogleUtilities/GULLogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extern BOOL GULIsLoggableLevel(GULLoggerLevel loggerLevel);
6161
* Register version to include in logs.
6262
* (required) version
6363
*/
64-
extern void GULLoggerRegisterVersion(const char *version);
64+
extern void GULLoggerRegisterVersion(NSString *version);
6565

6666
/**
6767
* Logs a message to the Xcode console and the device log. If running from AppStore, will

0 commit comments

Comments
 (0)