summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-31 17:51:29 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-31 17:51:29 +0000
commit2593ef3771878f36d8b930d175595d13c008f850 (patch)
tree9b34c9b2fa2ca59c43492970fedd62925c8d70f0 /perl-install
parentdf8fa7b18d09201309a31a24e983f80fffce37fb (diff)
downloaddrakx-2593ef3771878f36d8b930d175595d13c008f850.tar
drakx-2593ef3771878f36d8b930d175595d13c008f850.tar.gz
drakx-2593ef3771878f36d8b930d175595d13c008f850.tar.bz2
drakx-2593ef3771878f36d8b930d175595d13c008f850.tar.xz
drakx-2593ef3771878f36d8b930d175595d13c008f850.zip
(dmidecode) fix crashing on parsing garbaged DMI info (mga#4329)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/detect_devices.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 346f7ff06..d29661cb4 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- make drakclock systemd compatible
+- fix crashing on parsing garbaged DMI info (mga#4329)
- diskdrake:
o use better cipher for encrypted fses (mga#3092)
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 3c2fe0065..8cc4935d3 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1081,6 +1081,7 @@ sub dmidecode() {
}
foreach (@l) {
+ next if /TRUNCATED/;
if (/^$tab\t(.*)/) {
$dmis[-1]{string} .= "$1\n";
$dmis[-1]{$1} = $2 if /^$tab\t(.*): (.*)$/;