From 26f5476a62c272df1b8015a9f74371c0c5194999 Mon Sep 17 00:00:00 2001
From: kingcanfish <gxylong@gmail.com>
Date: Thu, 17 Oct 2024 15:04:21 +0800
Subject: [PATCH] fix(tree): Keep panic information consistent when wildcard
 type build failed and update ci-lint version

---
 .github/workflows/gin.yml |  2 +-
 tree.go                   |  2 +-
 tree_test.go              | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gin.yml b/.github/workflows/gin.yml
index 947abf9c90..74983c5006 100644
--- a/.github/workflows/gin.yml
+++ b/.github/workflows/gin.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.58.1
+          version: v1.61.0
           args: --verbose
   test:
     needs: lint
diff --git a/tree.go b/tree.go
index b0a5f98222..0d3e5a8c12 100644
--- a/tree.go
+++ b/tree.go
@@ -369,7 +369,7 @@ func (n *node) insertChild(path string, fullPath string, handlers HandlersChain)
 
 		// currently fixed width 1 for '/'
 		i--
-		if path[i] != '/' {
+		if i < 0 || path[i] != '/' {
 			panic("no / before catch-all in path '" + fullPath + "'")
 		}
 
diff --git a/tree_test.go b/tree_test.go
index 3aa3a59444..74eb61049b 100644
--- a/tree_test.go
+++ b/tree_test.go
@@ -993,3 +993,28 @@ func TestTreeInvalidEscape(t *testing.T) {
 		}
 	}
 }
+
+func TestWildcardInvalidSlash(t *testing.T) {
+	const panicMsgPrefix = "no / before catch-all in path"
+
+	routes := map[string]bool{
+		"/foo/bar":  true,
+		"/foo/x*zy": false,
+		"/foo/b*r":  false,
+	}
+
+	for route, valid := range routes {
+		tree := &node{}
+		recv := catchPanic(func() {
+			tree.addRoute(route, nil)
+		})
+
+		if recv == nil != valid {
+			t.Fatalf("%s should be %t but got %v", route, valid, recv)
+		}
+
+		if rs, ok := recv.(string); recv != nil && (!ok || !strings.HasPrefix(rs, panicMsgPrefix)) {
+			t.Fatalf(`"Expected panic "%s" for route '%s', got "%v"`, panicMsgPrefix, route, recv)
+		}
+	}
+}