Merge pull request #140 from swilson/master

hathach · web-flow · commit a07fbec13697 · 2018-04-06T23:17:20.000+07:00
Fix crash caused by incorrectly formatted (e.g. 1 byte) device reports.
diff --git a/libraries/Bluefruit52Lib/src/BLEScanner.cpp b/libraries/Bluefruit52Lib/src/BLEScanner.cpp
@@ -147,6 +147,8 @@ uint8_t BLEScanner::parseReportByType(const uint8_t* scandata, uint8_t scanlen,
   uint8_t len = 0;
   uint8_t const* ptr = NULL;
 
+  if ( scanlen < 2 ) return 0;
+
   // len (1+data), type, data
   while ( scanlen )
   {

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ uint8_t BLEScanner::parseReportByType(const uint8_t* scandata, uint8_t scanlen,`
`147`	`147`	`uint8_t len = 0;`
`148`	`148`	`uint8_t const* ptr = NULL;`
`149`	`149`
	`150`	`+ if ( scanlen < 2 ) return 0;`
	`151`	`+`
`150`	`152`	`// len (1+data), type, data`
`151`	`153`	`while ( scanlen )`
`152`	`154`	`{`