merge branch 'pr-1560'
Check error return values
LGTMs: @crosbymichael @cyphar
Closes #1560
diff --git a/signals.go b/signals.go
index bef0ff4..a0b918f 100644
--- a/signals.go
+++ b/signals.go
@@ -75,11 +75,15 @@
}
// perform the initial tty resize.
- tty.resize()
+ if err := tty.resize(); err != nil {
+ logrus.Error(err)
+ }
for s := range h.signals {
switch s {
case unix.SIGWINCH:
- tty.resize()
+ if err := tty.resize(); err != nil {
+ logrus.Error(err)
+ }
case unix.SIGCHLD:
exits, err := h.reap()
if err != nil {
diff --git a/utils_linux.go b/utils_linux.go
index eb81289..6f6ff58 100644
--- a/utils_linux.go
+++ b/utils_linux.go
@@ -371,7 +371,10 @@
}
if notifySocket != nil {
- notifySocket.setupSocket()
+ err := notifySocket.setupSocket()
+ if err != nil {
+ return -1, err
+ }
}
// Support on-demand socket activation by passing file descriptors into the container init process.
