Skip to content

Commit 520ede6

Browse files
fix panic when timeout is nil in gitlab cloneOptions (#1016)
Co-authored-by: jackyu <jackyu@yunify.com>
1 parent 6afb8d9 commit 520ede6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

pkg/client/devops/jenkins/internal/gitlab.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,15 @@ func GetGitlabSourceFromEtree(source *etree.Element) (gitSource *devopsv1alpha3.
145145
if value, err := strconv.ParseBool(cloneExtension.SelectElement("shallow").Text()); err == nil {
146146
gitSource.CloneOption.Shallow = value
147147
}
148-
if value, err := strconv.ParseInt(cloneExtension.SelectElement("timeout").Text(), 10, 32); err == nil {
149-
gitSource.CloneOption.Timeout = int(value)
148+
if timeout := cloneExtension.SelectElement("timeout"); timeout != nil {
149+
if value, err := strconv.ParseInt(timeout.Text(), 10, 32); err == nil {
150+
gitSource.CloneOption.Timeout = int(value)
151+
}
150152
}
151-
if value, err := strconv.ParseInt(cloneExtension.SelectElement("depth").Text(), 10, 32); err == nil {
152-
gitSource.CloneOption.Depth = int(value)
153+
if depth := cloneExtension.SelectElement("depth"); depth != nil {
154+
if value, err := strconv.ParseInt(depth.Text(), 10, 32); err == nil {
155+
gitSource.CloneOption.Depth = int(value)
156+
}
153157
}
154158
}
155159
}

0 commit comments

Comments
 (0)