Skip to content

Commit 42b7ef0

Browse files
authored
slog: Ignore frames with a zero PC (uber-go#1258)
1 parent 05c4b6c commit 42b7ef0

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

exp/zapslog/slog.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,16 @@ func (h *Handler) Handle(ctx context.Context, record slog.Record) error {
144144
return nil
145145
}
146146

147-
if h.addSource {
147+
if h.addSource && record.PC != 0 {
148148
frame, _ := runtime.CallersFrames([]uintptr{record.PC}).Next()
149-
ce.Caller = zapcore.EntryCaller{
150-
Defined: true,
151-
PC: frame.PC,
152-
File: frame.File,
153-
Line: frame.Line,
154-
Function: frame.Function,
149+
if frame.PC != 0 {
150+
ce.Caller = zapcore.EntryCaller{
151+
Defined: true,
152+
PC: frame.PC,
153+
File: frame.File,
154+
Line: frame.Line,
155+
Function: frame.Function,
156+
}
155157
}
156158
}
157159

0 commit comments

Comments
 (0)