<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10125">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">USB: print decoded USB error<br><br>In case of error it also ensures the returned value is NULL.<br>Else a segfault would occur because the caller (e.g. remsim)<br>continued on with a free handler.<br><br>Change-Id: Ie7f20e3eff03acf77eb08283747ca8e032b9b4c8<br>---<br>M host/libusb_util.c<br>1 file changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/libusb_util.c b/host/libusb_util.c</span><br><span>index 8565372..cb435e2 100644</span><br><span>--- a/host/libusb_util.c</span><br><span>+++ b/host/libusb_util.c</span><br><span>@@ -250,34 +250,39 @@</span><br><span>                 (strlen(ifm->path) && !strcmp(path, ifm->path))) {</span><br><span>                         rc = libusb_open(*dev, &usb_devh);</span><br><span>                       if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                perror("Cannot open device");</span><br><span style="color: hsl(120, 100%, 40%);">+                               fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc));</span><br><span style="color: hsl(120, 100%, 40%);">+                         usb_devh = NULL;</span><br><span>                             break;</span><br><span>                       }</span><br><span>                    rc = libusb_get_configuration(usb_devh, &config);</span><br><span>                        if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                perror("Cannot get current configuration");</span><br><span style="color: hsl(120, 100%, 40%);">+                         fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc));</span><br><span>                          libusb_close(usb_devh);</span><br><span style="color: hsl(120, 100%, 40%);">+                               usb_devh = NULL;</span><br><span>                             break;</span><br><span>                       }</span><br><span>                    if (config != ifm->configuration) {</span><br><span>                               rc = libusb_set_configuration(usb_devh, ifm->configuration);</span><br><span>                              if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                        perror("Cannot set configuration");</span><br><span style="color: hsl(120, 100%, 40%);">+                                 fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc));</span><br><span>                                  libusb_close(usb_devh);</span><br><span style="color: hsl(120, 100%, 40%);">+                                       usb_devh = NULL;</span><br><span>                                     break;</span><br><span>                               }</span><br><span>                    }</span><br><span>                    rc = libusb_claim_interface(usb_devh, ifm->interface);</span><br><span>                    if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                perror("Cannot claim interface");</span><br><span style="color: hsl(120, 100%, 40%);">+                           fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc));</span><br><span>                            libusb_close(usb_devh);</span><br><span style="color: hsl(120, 100%, 40%);">+                               usb_devh = NULL;</span><br><span>                             break;</span><br><span>                       }</span><br><span>                    rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting);</span><br><span>                      if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                perror("Cannot set interface altsetting");</span><br><span style="color: hsl(120, 100%, 40%);">+                          fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc));</span><br><span>                           libusb_release_interface(usb_devh, ifm->interface);</span><br><span>                               libusb_close(usb_devh);</span><br><span style="color: hsl(120, 100%, 40%);">+                               usb_devh = NULL;</span><br><span>                             break;</span><br><span>                       }</span><br><span>            }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10125">change 10125</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10125"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie7f20e3eff03acf77eb08283747ca8e032b9b4c8 </div>
<div style="display:none"> Gerrit-Change-Number: 10125 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>