TARGET_NRF - Fix possible invalid comparison.

pan- · pan- · commit 80740dda069e · 2016-09-26T13:28:44.000+01:00
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/sdk/source/ble/peer_manager/pm_buffer.c b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/sdk/source/ble/peer_manager/pm_buffer.c
@@ -93,7 +93,7 @@ uint8_t pm_buffer_block_acquire(pm_buffer_t * p_buffer, uint32_t n_blocks)
             {
                 first_locked_mutex = i;
             }
-            if ((i - first_locked_mutex + 1) == n_blocks)
+            if ((i - first_locked_mutex + 1) >= 0 && ((uint32_t)(i - first_locked_mutex + 1)) == n_blocks)
             {
                 return first_locked_mutex;
             }
diff --git a/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/sdk/ble/peer_manager/pm_buffer.c b/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/sdk/ble/peer_manager/pm_buffer.c
@@ -100,7 +100,7 @@ uint8_t pm_buffer_block_acquire(pm_buffer_t * p_buffer, uint32_t n_blocks)
             {
                 first_locked_mutex = i;
             }
-            if ((i - first_locked_mutex + 1) == n_blocks)
+            if ((i - first_locked_mutex + 1) >= 0 && ((uint32_t) (i - first_locked_mutex + 1)) == n_blocks)
             {
                 return first_locked_mutex;
             }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ uint8_t pm_buffer_block_acquire(pm_buffer_t * p_buffer, uint32_t n_blocks)`
`93`	`93`	`{`
`94`	`94`	`first_locked_mutex = i;`
`95`	`95`	`}`
`96`		`- if ((i - first_locked_mutex + 1) == n_blocks)`
	`96`	`+ if ((i - first_locked_mutex + 1) >= 0 && ((uint32_t)(i - first_locked_mutex + 1)) == n_blocks)`
`97`	`97`	`{`
`98`	`98`	`return first_locked_mutex;`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ uint8_t pm_buffer_block_acquire(pm_buffer_t * p_buffer, uint32_t n_blocks)`
`100`	`100`	`{`
`101`	`101`	`first_locked_mutex = i;`
`102`	`102`	`}`
`103`		`- if ((i - first_locked_mutex + 1) == n_blocks)`
	`103`	`+ if ((i - first_locked_mutex + 1) >= 0 && ((uint32_t) (i - first_locked_mutex + 1)) == n_blocks)`
`104`	`104`	`{`
`105`	`105`	`return first_locked_mutex;`
`106`	`106`	`}`