Prevent accessing past the UsageList bounds in the HID parser when dequeueing a usage.

[pub/USBasp.git] / Demos / Host / LowLevel / KeyboardHostWithParser / HIDReport.h

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h
index 428b91a..4b4bfe6 100644 (file)
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h
@@ -1,24 +1,24 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2013.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -38,8 +38,7 @@
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
-               #include <LUFA/Drivers/USB/Class/Host/HIDParser.h>
-               
+
                #include "KeyboardHostWithParser.h"
 
        /* Macros: */
@@ -54,21 +53,6 @@
                        ParseError              = 1, /**< Failed to fully process the HID report descriptor */
                        ParseControlError       = 2, /**< Control error occurred while trying to read the device HID descriptor */
                };
-               
-       /* Type Defines: */
-               /** Type define for a HID descriptor. */
-               typedef struct
-               {
-                       USB_Descriptor_Header_t  Header; /**< Regular descriptor header containing the descriptor's type and length */
-                               
-                       uint16_t                 HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
-                       uint8_t                  CountryCode; /**< Country code value for localized hardware */
-               
-                       uint8_t                  TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */
-
-                       uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */
-                       uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */
-               } USB_Descriptor_HID_t;
 
        /* External Variables: */
                extern uint16_t         HIDReportSize;
@@ -77,6 +61,7 @@
        /* Function Prototypes: */
                uint8_t GetHIDReportData(void);
 
-               bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem);
-               
+               bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);
+
 #endif
+