diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-07-01 07:25:53 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-07-01 07:25:53 +0000 |
| commit | 45871e99e9c73c66b39c81c390005572590e2056 (patch) | |
| tree | 085222809c6e822f679408cd1fb00cfa70ad01b5 | |
| parent | f08e027ec693de17421bf94073dbce41f045b6ce (diff) | |
| download | ChibiOS-45871e99e9c73c66b39c81c390005572590e2056.tar.gz ChibiOS-45871e99e9c73c66b39c81c390005572590e2056.tar.bz2 ChibiOS-45871e99e9c73c66b39c81c390005572590e2056.zip | |
Fixed bug #955.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12123 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/lib/src/chmemheaps.c | 2 | ||||
| -rw-r--r-- | readme.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/os/lib/src/chmemheaps.c b/os/lib/src/chmemheaps.c index 2646f2929..a03bde2e7 100644 --- a/os/lib/src/chmemheaps.c +++ b/os/lib/src/chmemheaps.c @@ -266,7 +266,7 @@ void *chHeapAllocAligned(memory_heap_t *heapp, size_t size, unsigned align) { /* More memory is required, tries to get it from the associated provider
else fails.*/
if (heapp->provider != NULL) {
- ahp = heapp->provider((pages + 1U) * CH_HEAP_ALIGNMENT,
+ ahp = heapp->provider(pages * CH_HEAP_ALIGNMENT,
align,
sizeof (heap_header_t));
if (ahp != NULL) {
diff --git a/readme.txt b/readme.txt index b55221ff6..36b3c34ff 100644 --- a/readme.txt +++ b/readme.txt @@ -138,6 +138,7 @@ - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- LIB: Fixed heap allocation issue (bug #955)(backported to 18.2.2 and 17.6.5).
- HAL: Fixed win32 simulator HAL broken because a typo (bug #954)(backported
to 18.2.2).
- HAL: Fixed race condition in STM32 ADCv3 driver (bug #953)(backported to
|