From 0e9b1af56b100093fb6bb41ca0d7a04be7db159b Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 7 Nov 2019 18:57:31 -0700
Subject: [PATCH] Added safety check to Disk().get_details()

---
 scripts/wk/hw/obj.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py
index 94bbdc54..e1ced59f 100644
--- a/scripts/wk/hw/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -286,7 +286,11 @@ class Disk():
         self.details[attr] = str(self.details[attr])
     for attr in ['phy-sec', 'size']:
       if not isinstance(self.details[attr], int):
-        self.details[attr] = int(self.details[attr])
+        try:
+          self.details[attr] = int(self.details[attr])
+        except (TypeError, ValueError):
+          LOG.error('Invalid disk %s: %s', attr, self.details[attr])
+          self.details[attr] = -1
 
     # Set description
     self.description = '{size_str} ({bus}) {model} {serial}'.format(