From b154fc8037fa00abf0c0103cac88c0dcd89295e9 Mon Sep 17 00:00:00 2001
From: fwhez <1728565484@qq.com>
Date: Fri, 28 Aug 2020 10:39:03 +0800
Subject: [PATCH] #2480 c.Error(nil)
---
.idea/gin.iml | 8 ++
.idea/misc.xml | 86 ++++++++++++
.idea/modules.xml | 8 ++
.idea/vcs.xml | 6 +
.idea/workspace.xml | 322 ++++++++++++++++++++++++++++++++++++++++++++
context.go | 9 +-
6 files changed, 438 insertions(+), 1 deletion(-)
create mode 100644 .idea/gin.iml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
create mode 100644 .idea/workspace.xml
diff --git a/.idea/gin.iml b/.idea/gin.iml
new file mode 100644
index 00000000..c956989b
--- /dev/null
+++ b/.idea/gin.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..43cf969f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..01e61704
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..8da3a8a5
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,322 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Benchmark
+ benchReq
+ strings.Builder
+ Error(
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/context.go b/context.go
index 95b1807d..07c48e29 100644
--- a/context.go
+++ b/context.go
@@ -208,6 +208,11 @@ func (c *Context) AbortWithError(code int, err error) *Error {
/********* ERROR MANAGEMENT *********/
/************************************/
+// Avoid panic case
+var emptyError = &Error{
+ Err: fmt.Errorf("err is nil"),
+ Type: ErrorTypePrivate,
+}
// Error attaches an error to the current context. The error is pushed to a list of errors.
// It's a good idea to call Error for each error that occurred during the resolution of a request.
// A middleware can be used to collect all the errors and push them to a database together,
@@ -215,7 +220,9 @@ func (c *Context) AbortWithError(code int, err error) *Error {
// Error will panic if err is nil.
func (c *Context) Error(err error) *Error {
if err == nil {
- panic("err is nil")
+ // Avoid panic case, and do not push it into c.Errors
+ return emptyError
+ //panic("err is nil")
}
parsedError, ok := err.(*Error)