Merge pull request #15799 from mheon/fix_2126697

Ensure that a broken OCI spec does not break inspect
containers · Sep 14, 2022 · 4fc18d0 · 4fc18d0
2 parents bb4872e + 42937cd
commit 4fc18d0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/libpod/container.go b/libpod/container.go
@@ -356,7 +356,9 @@ func (c *Container) specFromState() (*spec.Spec, error) {
 			return nil, fmt.Errorf("reading container config: %w", err)
 		}
 		if err := json.Unmarshal(content, &returnSpec); err != nil {
-			return nil, fmt.Errorf("unmarshalling container config: %w", err)
+			// Malformed spec, just use c.config.Spec instead
+			logrus.Warnf("Error unmarshalling container %s config: %v", c.ID(), err)
+			return c.config.Spec, nil
 		}
 	} else if !os.IsNotExist(err) {
 		// ignore when the file does not exist