X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fkinetis.c;h=433d91e9e0c909475194a9a62906055007a45bbb;hb=73d87c6210bcd049b738583973fefdea0e32c6fa;hp=71722c645fef6120155a95e0646a48ec0ae56d14;hpb=4c3972c1df759564343aa63a424f7791a8ab9b19;p=openocd.git

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 71722c645f..433d91e9e0 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -435,7 +435,13 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer,
 			LOG_DEBUG("write longword @ %08X", offset + i);
 
 			w0 = (0x06 << 24) | (bank->base + offset + i);
-			w1 = buf_get_u32(buffer + offset + i, 0, 32);
+			if (count - i < 4) {
+				uint32_t padding = 0xffffffff;
+				memcpy(&padding, buffer + i, count - i);
+				w1 = buf_get_u32(&padding, 0, 32);
+			} else {
+				w1 = buf_get_u32(buffer + i, 0, 32);
+			}
 
 			result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);