avarice/jtag2usb.patch

   1 --- src/jtag2usb.cc     2007/02/17 22:41:46     1.9
   2 +++ src/jtag2usb.cc     2009/06/25 09:29:21     1.10
   3 @@ -18,7 +18,7 @@
   4   * This file implements the libusb-based USB connection to a JTAG ICE
   5   * mkII.
   6   *
   7 - * $Id: jtag2usb.cc,v 1.9 2007/02/17 22:41:46 joerg_wunsch Exp $
   8 + * $Id: jtag2usb.cc,v 1.10 2009/06/25 09:29:21 joerg_wunsch Exp $
   9   */
  10
  11
  12 @@ -70,7 +70,7 @@
  13    struct usb_bus *bus;
  14    struct usb_device *dev;
  15    usb_dev_handle *udev;
  16 -  char *serno, *cp2;
  17 +  char *devnamecopy, *serno, *cp2;
  18    u_int16_t pid;
  19    size_t x;
  20
  21 @@ -85,6 +85,9 @@
  22        break;
  23      }
  24
  25 +  devnamecopy = new char[x = strlen(jtagDeviceName) + 1];
  26 +  memcpy(devnamecopy, jtagDeviceName, x);
  27 +
  28    /*
  29     * The syntax for usb devices is defined as:
  30     *
  31 @@ -95,7 +98,7 @@
  32     * right-to-left, so only the least significant nibbles need to be
  33     * specified.
  34     */
  35 -  if ((serno = strchr(jtagDeviceName, ':')) != NULL)
  36 +  if ((serno = strchr(devnamecopy, ':')) != NULL)
  37      {
  38        /* first, drop all colons there if any */
  39        cp2 = ++serno;
  40 @@ -159,6 +162,8 @@
  41             }
  42         }
  43      }
  44 +
  45 +  delete devnamecopy;
  46    if (!found)
  47    {
  48      printf("did not find any%s USB device \"%s\"\n",