Saturate length of retrieved advertisement data

polldo · polldo · commit a9550cf9a273 · 2021-04-20T17:29:03.000+02:00
diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
@@ -184,15 +184,15 @@ String BLEDevice::advertisedServiceUuid(int index) const
   return serviceUuid;
 }
 
-int BLEDevice::advertisementData(uint8_t value[], int length)
+int BLEDevice::advertisementData(uint8_t value[], int length) const
 {
-  if (_eirDataLength > length) return 0;  // Check that buffer size is sufficient
+  if (length > _eirDataLength) length = _eirDataLength;
 
-  if (_eirDataLength) {
-    memcpy(value, _eirData, _eirDataLength);
+  if (length) {
+    memcpy(value, _eirData, length);
   }
 
-  return _eirDataLength;
+  return length;
 }
 
 int BLEDevice::rssi()
diff --git a/src/BLEDevice.h b/src/BLEDevice.h
@@ -59,7 +59,7 @@ class BLEDevice {
   String advertisedServiceUuid() const;
   String advertisedServiceUuid(int index) const;
 
-  int advertisementData(uint8_t value[], int length);
+  int advertisementData(uint8_t value[], int length) const;
 
   virtual int rssi();
 

Original file line number	Diff line number	Diff line change
`@@ -184,15 +184,15 @@ String BLEDevice::advertisedServiceUuid(int index) const`
`184`	`184`	`return serviceUuid;`
`185`	`185`	`}`
`186`	`186`
`187`		`-int BLEDevice::advertisementData(uint8_t value[], int length)`
	`187`	`+int BLEDevice::advertisementData(uint8_t value[], int length) const`
`188`	`188`	`{`
`189`		`- if (_eirDataLength > length) return 0; // Check that buffer size is sufficient`
	`189`	`+ if (length > _eirDataLength) length = _eirDataLength;`
`190`	`190`
`191`		`- if (_eirDataLength) {`
`192`		`- memcpy(value, _eirData, _eirDataLength);`
	`191`	`+ if (length) {`
	`192`	`+ memcpy(value, _eirData, length);`
`193`	`193`	`}`
`194`	`194`
`195`		`- return _eirDataLength;`
	`195`	`+ return length;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`int BLEDevice::rssi()`