target/target: Check checksum_memory before call

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index ed6f655eac68607285030188b894db34141a4979..e9cbe39b7ad886d13044fb3ad267bfb8e31eba7e 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2148,11 +2148,10 @@ static int target_restore_working_area(struct target *target, struct working_are
 /* Restore the area's backup memory, if any, and return the area to the allocation pool */
 static int target_free_working_area_restore(struct target *target, struct working_area *area, int restore)
 {
-       int retval = ERROR_OK;
-
-       if (area->free)
-               return retval;
+       if (!area || area->free)
+               return ERROR_OK;
 
+       int retval = ERROR_OK;
        if (restore) {
                retval = target_restore_working_area(target, area);
                /* REVISIT: Perhaps the area should be freed even if restoring fails. */
@@ -2531,6 +2530,10 @@ int target_checksum_memory(struct target *target, target_addr_t address, uint32_
                LOG_ERROR("Target not examined yet");
                return ERROR_FAIL;
        }
+       if (!target->type->checksum_memory) {
+               LOG_ERROR("Target %s doesn't support checksum_memory", target_name(target));
+               return ERROR_FAIL;
+       }
 
        retval = target->type->checksum_memory(target, address, size, &checksum);
        if (retval != ERROR_OK) {
@@ -6401,8 +6404,7 @@ next:
 out:
        free(test_pattern);
 
-       if (wa)
-               target_free_working_area(target, wa);
+       target_free_working_area(target, wa);
 
        /* Test writes */
        num_bytes = test_size + 4 + 4 + 4;
@@ -6486,8 +6488,7 @@ nextw:
 
        free(test_pattern);
 
-       if (wa)
-               target_free_working_area(target, wa);
+       target_free_working_area(target, wa);
        return retval;
 }