Update copyrights for 2021.

[pub/USBasp.git] / Bootloaders / DFU / BootloaderAPI.c

diff --git a/Bootloaders/DFU/BootloaderAPI.c b/Bootloaders/DFU/BootloaderAPI.c
index 5e8083e..b47604c 100644 (file)
--- a/Bootloaders/DFU/BootloaderAPI.c
+++ b/Bootloaders/DFU/BootloaderAPI.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2018.
+     Copyright (C) Dean Camera, 2021.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2018  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2021  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -35,8 +35,20 @@
 
 #include "BootloaderAPI.h"
 
 
 #include "BootloaderAPI.h"
 

+static bool IsPageAddressValid(const uint32_t Address)
+{
+       /* Determine if the given page address is correctly aligned to the
+          start of a flash page. */
+       bool PageAddressIsAligned = !(Address & (SPM_PAGESIZE - 1));
+
+       return (Address < BOOT_START_ADDR) && PageAddressIsAligned;
+}
+

 void BootloaderAPI_ErasePage(const uint32_t Address)
 {
 void BootloaderAPI_ErasePage(const uint32_t Address)
 {

+       if (! IsPageAddressValid(Address))
+               return;
+

        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        {
                boot_page_erase_safe(Address);
        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        {
                boot_page_erase_safe(Address);


@@ -47,6 +59,9 @@ void BootloaderAPI_ErasePage(const uint32_t Address)
 
 void BootloaderAPI_WritePage(const uint32_t Address)
 {
 
 void BootloaderAPI_WritePage(const uint32_t Address)
 {

+       if (! IsPageAddressValid(Address))
+               return;
+

        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        {
                boot_page_write_safe(Address);
        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        {
                boot_page_write_safe(Address);