check in stderrFrame is nil before logging stderrFrame.Data (#17815)

hashicorp · Jul 24, 2023 · 9b0e75b · 9b0e75b
1 parent 7a7d93a
commit 9b0e75b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.changelog/17815.txt b/.changelog/17815.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fix panic in `alloc logs` command when receiving empty stdout or stderr log frames
+```
diff --git a/command/alloc_logs.go b/command/alloc_logs.go
@@ -394,11 +394,15 @@ func (l *AllocLogsCommand) tailMultipleFiles(client *api.Client, alloc *api.Allo
 		case stdoutErr := <-stdoutErrCh:
 			return fmt.Errorf("received an error from stdout log stream: %v", stdoutErr)
 		case stdoutFrame := <-stdoutFrames:
-			logUI.Output(string(stdoutFrame.Data))
+			if stdoutFrame != nil {
+				logUI.Output(string(stdoutFrame.Data))
+			}
 		case stderrErr := <-stderrErrCh:
 			return fmt.Errorf("received an error from stderr log stream: %v", stderrErr)
 		case stderrFrame := <-stderrFrames:
-			logUI.Warn(string(stderrFrame.Data))
+			if stderrFrame != nil {
+				logUI.Warn(string(stderrFrame.Data))
+			}
 		}
 	}
 }