|
 |
a7f575 |
From 44f6033c48968945353109af69114b5d0a1700de Mon Sep 17 00:00:00 2001
|
|
|
a7f575 |
From: Jhon Honce <jhonce@redhat.com>
|
|
|
a7f575 |
Date: Fri, 11 Oct 2019 16:08:59 -0700
|
|
|
a7f575 |
Subject: [PATCH] Check for both nil and zero length
|
|
|
a7f575 |
|
|
|
a7f575 |
Signed-off-by: Jhon Honce <jhonce@redhat.com>
|
|
|
a7f575 |
---
|
|
|
a7f575 |
libcontainer/generic_error.go | 4 ++++
|
|
|
a7f575 |
1 file changed, 4 insertions(+)
|
|
|
a7f575 |
|
|
|
a7f575 |
diff --git a/libcontainer/generic_error.go b/libcontainer/generic_error.go
|
|
|
a7f575 |
index de37715c..0f90369b 100644
|
|
|
a7f575 |
--- a/runc-66aedde759f33c190954815fb765eedc1d782dd9/libcontainer/generic_error.go
|
|
|
a7f575 |
+++ b/runc-66aedde759f33c190954815fb765eedc1d782dd9/libcontainer/generic_error.go
|
|
|
a7f575 |
@@ -93,6 +93,10 @@ func (e *genericError) Error() string {
|
|
|
a7f575 |
if e.Cause == "" {
|
|
|
a7f575 |
return e.Message
|
|
|
a7f575 |
}
|
|
|
a7f575 |
+
|
|
|
a7f575 |
+ if len(e.Stack.Frames) == 0 {
|
|
|
a7f575 |
+ return fmt.Sprintf("<unknown>:<unknown>: %s caused %q", e.Cause, e.Message)
|
|
|
a7f575 |
+ }
|
|
|
a7f575 |
frame := e.Stack.Frames[0]
|
|
|
a7f575 |
return fmt.Sprintf("%s:%d: %s caused %q", frame.File, frame.Line, e.Cause, e.Message)
|
|
|
a7f575 |
}
|