Test product_string not nullptr before comparison

Joerg Wunsch · Joerg Wunsch · commit 28667b6401fa · 2022-01-16T16:13:51.000Z
This happens to be the case on Raspberry Pi, for whatever
reason.


git-svn-id: svn://svn.code.sf.net/p/avarice/code/trunk/avarice@423 a7e36acc-7495-4a18-91ca-7b9a7881be12
diff --git a/src/jtag2usb.cc b/src/jtag2usb.cc
@@ -643,7 +643,8 @@ static hid_device *openhid(const char *jtagDeviceName, unsigned int &max_pkt_siz
   walk = list;
   while (walk)
     {
-      if (wcsstr(walk->product_string, L"CMSIS-DAP") != NULL)
+      if (walk->product_string != nullptr &&
+	  wcsstr(walk->product_string, L"CMSIS-DAP") != NULL)
 	{
 	  debugOut("Found HID PID:VID 0x%04x:0x%04x, serno %ls\n",
 		   walk->vendor_id, walk->product_id,

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,8 @@ static hid_device openhid(const char jtagDeviceName, unsigned int &max_pkt_siz`
`643`	`643`	`walk = list;`
`644`	`644`	`while (walk)`
`645`	`645`	`{`
`646`		`- if (wcsstr(walk->product_string, L"CMSIS-DAP") != NULL)`
	`646`	`+ if (walk->product_string != nullptr &&`
	`647`	`+ wcsstr(walk->product_string, L"CMSIS-DAP") != NULL)`
`647`	`648`	`{`
`648`	`649`	`debugOut("Found HID PID:VID 0x%04x:0x%04x, serno %ls\n",`
`649`	`650`	`walk->vendor_id, walk->product_id,`