From: texane <texane@gmail.com>
Date: Mon, 17 Aug 2015 20:06:57 +0000 (+0200)
Subject: Merge pull request #329 from dj3vande/gdbserver-segfault-fix
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1a1f950027609aca26b107762a83b22632a391da;hp=8271b32501d9af7e1c73ed343e6d33538d45ce41;p=fw%2Fstlink

Merge pull request #329 from dj3vande/gdbserver-segfault-fix

Fix segfault in gdb-server
---

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index bae496d..31f9beb 100644
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -705,8 +705,8 @@ static int flash_go(stlink_t *sl) {
     for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
         DLOG("flash_do: block %08x -> %04x\n", fb->addr, fb->length);
 
-        unsigned length = fb->length;
         for(stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += FLASH_PAGE) {
+            unsigned length = fb->length - (page - fb->addr);
 
             //Update FLASH_PAGE
             stlink_calculate_pagesize(sl, page);