github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61553 from hongchaodeng/time

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

meta/v1: check error from json.Unmarshal()

Release note:
```
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-25 21:34:10 -07:00 committed by GitHub
commit 433c01a7b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time.go
View File

@ -106,7 +106,10 @@ func (t *Time) UnmarshalJSON(b []byte) error {
} }
var str string var str string
json.Unmarshal(b, &str) err := json.Unmarshal(b, &str)
if err != nil {
return err
}
pt, err := time.Parse(time.RFC3339, str) pt, err := time.Parse(time.RFC3339, str)
if err != nil { if err != nil {