Merge lp:~swem/ubuntu/wily/lshw/lp1471983 into lp:ubuntu/wily-proposed/lshw

[Chen-Han Hsiao (Stanley)]

For bug 1471983, I also encounter this issue in Ubuntu OEM project.

This bug is fixed in https://github.com/lyonel/lshw/commit/d048d300b5daeb44887a7fc06ddeb120119cac8a

The issue in upstream: [lshw segfaults, with some 16GB USB-3 sticks from Patriot] http://www.ezix.org/project/ticket/653

I've made a patch to fix it.

[Michael Terry (mterry)]

Looks good to me. Uploaded to wily.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-18 15:06:49 +0000
+++ debian/changelog	2015-10-11 13:48:56 +0000
@@ -1,3 +1,10 @@
+lshw (02.17-1.1ubuntu3) wily; urgency=medium
+
+  * [d048d30] Fix lshw crash issue on system with some USB-3 sticks
+    (LP: #1471983)
+
+ -- Chen-Han Hsiao (Stanley) <[e-mail]>  Sun, 11 Oct 2015 21:35:54 +0800
+
 lshw (02.17-1.1ubuntu2) wily; urgency=medium
 
   [ Manoj Iyer ]

=== added file 'debian/patches/presumably-fix-653.patch'
--- debian/patches/presumably-fix-653.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/presumably-fix-653.patch	2015-10-11 13:48:56 +0000
@@ -0,0 +1,30 @@
+From d048d300b5daeb44887a7fc06ddeb120119cac8a Mon Sep 17 00:00:00 2001
+From: Lyonel Vincent <[e-mail]>
+Date: Sun, 13 Jul 2014 11:21:59 +0000
+Subject: [PATCH] (presumably) fix #653
+
+git-svn-id: http://ezix.org/source/packages/lshw/development@2535 811e2811-9fd9-0310-a116-b6e8ac943c8b
+---
+ src/core/scsi.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/scsi.cc b/src/core/scsi.cc
+index ed059cb..d85fcc8 100644
+--- a/src/core/scsi.cc
++++ b/src/core/scsi.cc
+@@ -481,9 +481,9 @@ hwNode & node)
+   memset(rsp_buff, 0, sizeof(rsp_buff));
+   if (do_inq(sg_fd, 0, 1, 0x80, rsp_buff, MX_ALLOC_LEN, 0))
+   {
+-    len = rsp_buff[3];
+-    if (len > 0)
+-      node.setSerial(hw::strip(string(rsp_buff + 4, len)));
++    char _len = rsp_buff[3];
++    if (_len > 0)
++      node.setSerial(hw::strip(string(rsp_buff + 4, _len)));
+   }
+ 
+   memset(rsp_buff, 0, sizeof(rsp_buff));
+-- 
+1.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-08-18 15:06:49 +0000
+++ debian/patches/series	2015-10-11 13:48:56 +0000
@@ -16,3 +16,4 @@
 Do-not-brutally-merge-NICs-in-the-same-PCI-function-.patch
 smbios-noscan.patch
 fat-inspection.patch
+presumably-fix-653.patch