valentineus/0xFFFF
1
Fork 0
Code Releases Activity

nolo: Check for return buffer size

Browse Source
This commit is contained in:
Pali Rohár committed 2014-11-26 15:47:21 +01:00
1 parent bc9f42f559
commit 52efd5a404
1 file changed
+6
Download Patch File Download Diff File Expand all files Collapse all files
src/nolo.c
+6
View File
@@ -124,6 +124,9 @@ static int nolo_identify_string(struct usb_device_info * dev, const char * str,
if ( ret < 0 ) if ( ret < 0 )
NOLO_ERROR_RETURN("NOLO_IDENTIFY failed", -1); NOLO_ERROR_RETURN("NOLO_IDENTIFY failed", -1);
if ( (size_t)ret > sizeof(buf) )
ret = sizeof(buf);
ptr = memmem(buf, ret, str, strlen(str)); ptr = memmem(buf, ret, str, strlen(str));
if ( ! ptr ) if ( ! ptr )
ERROR_RETURN("Substring was not found", -1); ERROR_RETURN("Substring was not found", -1);
@@ -167,6 +170,9 @@ static int nolo_get_string(struct usb_device_info * dev, char * str, char * out,
if ( ( ret = usb_control_msg(dev->udev, NOLO_QUERY, NOLO_GET_STRING, 0, 0, out, size-1, 2000) ) < 0 ) if ( ( ret = usb_control_msg(dev->udev, NOLO_QUERY, NOLO_GET_STRING, 0, 0, out, size-1, 2000) ) < 0 )
return -1; return -1;
if ( (size_t)ret > size-1 )
ret = size-1;
out[size-1] = 0; out[size-1] = 0;
out[ret] = 0; out[ret] = 0;
return strlen(out); return strlen(out);