Skip to content

fix(os/gtime): add handling for nil time pointers to avoid causing panic #4323

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

Merged
hailaz merged 1 commit into from
Jun 24, 2025
Merged

fix(os/gtime): add handling for nil time pointers to avoid causing panic #4323

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
5 changes: 4 additions & 1 deletion os/gtime/gtime_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ func New(param ...interface{}) *Time {
switch r := param[0].(type) {
case time.Time:
return NewFromTime(r)

case *time.Time:
return NewFromTime(*r)
if r != nil {
return NewFromTime(*r)
}

case Time:
return &r
Expand Down
10 changes: 10 additions & 0 deletions os/gtime/gtime_z_unit_issue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,13 @@ func Test_Issue3558(t *testing.T) {
t.Assert(gfTimeFormat, stdTimeFormat)
})
}

// Test_Issue4307 https://github.com/gogf/gf/issues/4307
func Test_Issue4307(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
var timeNil *time.Time = nil
// This should not panic.
gfTime := gtime.New(timeNil)
t.AssertNil(gfTime)
})
}
Loading