From f1bdf1991cdc83e1b26448deea7bf3910aa8a881 Mon Sep 17 00:00:00 2001
From: khali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>
Date: Mon, 29 Jun 2015 11:55:38 +0000
Subject: decode-dimms: Complete check for out-of-bounds vendor ID

We also need to discard vendor ID 0 and to report "Unknown" if the
vendor is in a page we don't support yet.

Additionally, check that data is present at all for DDR3 modules as we
already do for pre-DDR3 modules.


git-svn-id: http://lm-sensors.org/svn/i2c-tools/branches/i2c-tools-3.1@6301 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 eeprom/decode-dimms | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eeprom/decode-dimms b/eeprom/decode-dimms
index 4781246..4a15fd7 100755
--- a/eeprom/decode-dimms
+++ b/eeprom/decode-dimms
@@ -343,9 +343,11 @@ sub manufacturer_ddr3($$)
 {
 	my ($count, $code) = @_;
 	return "Invalid" if parity($count) != 1;
-	return "Invalid" if parity($code) != 1;
-	return (($code & 0x7F) - 1 >= @{$vendors[$count & 0x7F]}) ? "Unknown" :
-		$vendors[$count & 0x7F][($code & 0x7F) - 1];
+	return "Invalid" if parity($code) != 1
+			 or ($code & 0x7F) == 0;
+	return "Unknown" if ($count & 0x7F) >= @vendors
+			 or ($code & 0x7F) - 1 >= @{$vendors[$count & 0x7F]};
+	return $vendors[$count & 0x7F][($code & 0x7F) - 1];
 }
 
 sub manufacturer(@)
-- 
cgit v1.2.1