Addressed Copilot's comments

pull/716/head
Daniele Lacamera 2026-03-09 15:22:11 +01:00
parent 64a355a0d8
commit e88e76ea51
2 changed files with 8 additions and 5 deletions

View File

@ -380,7 +380,7 @@ static void wolfBoot_verify_signature_ecc(uint8_t key_slot,
static inline int DecodeAsn1Tag(const uint8_t* input, int inputSz, int* inOutIdx,
int* tag_len, uint8_t tag)
{
if ((*inOutIdx + 1) >= inputSz) {
if (*inOutIdx < 0 || *inOutIdx >= inputSz || (*inOutIdx + 1) >= inputSz) {
return -1;
}
if (input[*inOutIdx] != tag) {

View File

@ -417,8 +417,10 @@ int spi_flash_read(uint32_t address, void *data, int len)
int spi_flash_write(uint32_t address, const void *data, int len)
{
int ret = 0;
int remaining = len;
uint32_t xferSz, page, pages;
uintptr_t addr;
uint8_t* ptr = (uint8_t*)data;
#ifdef DEBUG_QSPI
wolfBoot_printf("QSPI Flash Write: Len %d, %p -> 0x%x\n",
@ -430,13 +432,12 @@ int spi_flash_write(uint32_t address, const void *data, int len)
for (page = 0; page < pages; page++) {
ret = qspi_write_enable();
if (ret == 0) {
uint8_t* ptr;
xferSz = len - (page * FLASH_PAGE_SIZE);
if (xferSz > FLASH_PAGE_SIZE)
xferSz = (uint32_t)remaining;
if (xferSz > FLASH_PAGE_SIZE) {
xferSz = FLASH_PAGE_SIZE;
}
addr = address + (page * FLASH_PAGE_SIZE);
ptr = ((uint8_t*)data + (page * FLASH_PAGE_SIZE));
/* ------ Write Flash (page at a time) ------ */
ret = qspi_transfer(QSPI_MODE_WRITE, FLASH_WRITE_CMD,
@ -459,6 +460,8 @@ int spi_flash_write(uint32_t address, const void *data, int len)
break;
}
/* write disable is automatic */
remaining -= (int)xferSz;
ptr += xferSz;
}
}