Merge pull request #7 from imro2/2

Don't bail on exception
todbot · Sep 27, 2022 · 7c13fec · 7c13fec
2 parents 951d1c4 + 29f3d3a
commit 7c13fec
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/Program.cs b/Program.cs
@@ -27,9 +27,21 @@ static void Main(string[] args)
                     continue;
                 }
 
+                string manufacturer = "(unnamed manufacturer)";
+                try { manufacturer = dev.GetManufacturer(); } catch { }
+
+                string productName = "(unnamed product)";
+                try { productName = dev.GetProductName(); } catch { }
+
                 Console.Write(string.Format("{0:X4}:{1:X4}: {2} - {3}\nPATH:{4}\n",
-                    dev.VendorID, dev.ProductID, dev.GetManufacturer(), dev.GetProductName(), dev.DevicePath));
-                byte[] rawReportDescriptor = dev.GetRawReportDescriptor();
+                    dev.VendorID, dev.ProductID, manufacturer, productName, dev.DevicePath));
+                byte[] rawReportDescriptor = new byte[] { };
+                try
+                {
+                    rawReportDescriptor = dev.GetRawReportDescriptor();
+                } catch (Exception e){ 
+                    Console.Write("Unable to parse HID Report: {0}", e);
+                }
                 Console.Write("DESCRIPTOR:\n  ");
                 for( int i=0; i< rawReportDescriptor.Length; i++)
                 {