Merge pull request #10638 from AGlass0fMilk/fix-advertising-uuid-bug

0xc0170 · web-flow · commit b3328fdcc0f7 · 2019-05-23T14:46:49.000+01:00
Fix AdvertisingDataBuilder UUID Insertion Bug
diff --git a/features/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp b/features/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp
@@ -498,7 +498,7 @@ ble_error_t AdvertisingDataBuilder::setUUIDData(
     size_t old_size = getFieldSize(shortType) + getFieldSize(longType);
 
     /* if we can't fit the new data do not proceed */
-    if (new_size > data.size() - (_payload_length - old_size)) {
+    if (new_size > _buffer.size() - (_payload_length - old_size)) {
         return BLE_ERROR_BUFFER_OVERFLOW;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ ble_error_t AdvertisingDataBuilder::setUUIDData(`
`498`	`498`	`size_t old_size = getFieldSize(shortType) + getFieldSize(longType);`
`499`	`499`
`500`	`500`	`/* if we can't fit the new data do not proceed */`
`501`		`- if (new_size > data.size() - (_payload_length - old_size)) {`
	`501`	`+ if (new_size > _buffer.size() - (_payload_length - old_size)) {`
`502`	`502`	`return BLE_ERROR_BUFFER_OVERFLOW;`
`503`	`503`	`}`
`504`	`504`