Skip to content

Commit 2721fae

Browse files
committed
Fix potential SIGSEGV while logging
1 parent 2bb9a83 commit 2721fae

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

common/log.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct common_log_entry {
115115
}
116116
}
117117

118-
if (fcur && level != GGML_LOG_LEVEL_NONE && level != GGML_LOG_LEVEL_CONT && prefix) {
118+
if (level != GGML_LOG_LEVEL_NONE && level != GGML_LOG_LEVEL_CONT && prefix) {
119119
if (timestamp) {
120120
// [M.s.ms.us]
121121
fprintf(fcur, "%s%d.%02d.%03d.%03d%s ",
@@ -139,13 +139,9 @@ struct common_log_entry {
139139

140140
if (fcur) {
141141
fprintf(fcur, "%s", msg.data());
142-
}
143-
144-
if (fcur && (level == GGML_LOG_LEVEL_WARN || level == GGML_LOG_LEVEL_ERROR || level == GGML_LOG_LEVEL_DEBUG)) {
145-
fprintf(fcur, "%s", g_col[COMMON_LOG_COL_DEFAULT]);
146-
}
147-
148-
if (fcur) {
142+
if (level == GGML_LOG_LEVEL_WARN || level == GGML_LOG_LEVEL_ERROR || level == GGML_LOG_LEVEL_DEBUG) {
143+
fprintf(fcur, "%s", g_col[COMMON_LOG_COL_DEFAULT]);
144+
}
149145
fflush(fcur);
150146
}
151147

0 commit comments

Comments
 (0)