Merge pull request #13035 from pan-/fix-ble-service-data-addition

0xc0170 · web-flow · commit c7cf9a9aedee · 2020-06-05T10:49:43.000+02:00
Fix capacity check when service data are added to BLE advertising payload
diff --git a/features/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp b/features/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp
@@ -256,7 +256,7 @@ ble_error_t AdvertisingDataBuilder::setServiceData(
     );
 
     /* if we can't fit the new data do not proceed */
-    if (total_size > data.size() - (_payload_length - old_size)) {
+    if (total_size > (_buffer.size() - (_payload_length - old_size))) {
         return BLE_ERROR_BUFFER_OVERFLOW;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ ble_error_t AdvertisingDataBuilder::setServiceData(`
`256`	`256`	`);`
`257`	`257`
`258`	`258`	`/* if we can't fit the new data do not proceed */`
`259`		`- if (total_size > data.size() - (_payload_length - old_size)) {`
	`259`	`+ if (total_size > (_buffer.size() - (_payload_length - old_size))) {`
`260`	`260`	`return BLE_ERROR_BUFFER_OVERFLOW;`
`261`	`261`	`}`
`262`	`262`