Fixes #4796 handle unicodedecode errors from dmidecode output

11 years ago · 0242f10781
parent 576cd98d62
commit 0242f10781
1 changed files with 7 additions and 1 deletions
--- a/system/setup
+++ b/system/setup
@ -632,7 +632,13 @@ class LinuxHardware(Hardware):
                    (rc, out, err) = module.run_command('%s -s %s' % (dmi_bin, v))
                    if rc == 0:
                        # Strip out commented lines (specific dmidecode output)
-                        self.facts[k] = ''.join([ line for line in out.split('\n') if not line.startswith('#') ])
+                        thisvalue = ''.join([ line for line in out.split('\n') if not line.startswith('#') ])
+                        try:
+                            json.dumps(thisvalue)
+                        except UnicodeDecodeError:
+                            thisvalue = "NA"
+
+                        self.facts[k] = thisvalue
                    else:
                        self.facts[k] = 'NA'
                else: