tokens can be NULL

diff --git a/rigold.c b/rigold.c
index 4d4d0b337e3374c1fcfa2450dca46e952d81bc34..0be124f1147c877e81321983c9517eedc6530c2e 100644 (file)
--- a/rigold.c
+++ b/rigold.c
@@ -81,8 +81,12 @@ static void parse_request(int s, struct usb_dev_handle *sc)
        buf[ret] = 0;
 
        token = strtok_r(buf, delim, &saveptr);
        buf[ret] = 0;
 
        token = strtok_r(buf, delim, &saveptr);

+       if (token == NULL)
+               return;

        /* TODO: Only GET... */
        token = strtok_r(NULL, delim, &saveptr);
        /* TODO: Only GET... */
        token = strtok_r(NULL, delim, &saveptr);

+       if (token == NULL)
+               return;

        bzero(&file, sizeof(file));
        strncpy(file, token, sizeof(file)-1);
 
        bzero(&file, sizeof(file));
        strncpy(file, token, sizeof(file)-1);
 


@@ -116,7 +120,7 @@ int main(int argc, char **argv)
        socklen_t slen;
        struct usb_dev_handle *sc;
        struct sockaddr_in sin, clientsin;
        socklen_t slen;
        struct usb_dev_handle *sc;
        struct sockaddr_in sin, clientsin;

-       unsigned short port = 8888;
+       unsigned short port = 8088;

 
        sc = usbtmc_initscope();
 
 
        sc = usbtmc_initscope();