- reverted resume_target to old behaviour

[fw/openocd] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index 1eb956728f58c8b45cbca1162177b8aa627b1e99..16f328671e8697293d77f1efa80f3e28b15781d6 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -57,15 +57,19 @@ static int autodetect_image_type(image_t *image, char *url)
        {
                return retval;
        }
-       if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK)
-       {
-               return ERROR_FILEIO_OPERATION_FAILED;
-       }
-       if (read_bytes != 9)
+       retval = fileio_read(&fileio, 9, buffer, &read_bytes);
+       
+       if (retval==ERROR_OK)
        {
-               return ERROR_FILEIO_OPERATION_FAILED;
+               if (read_bytes != 9)
+               {
+                       retval=ERROR_FILEIO_OPERATION_FAILED;
+               }
        }
        fileio_close(&fileio);
+       
+       if (retval!=ERROR_OK)
+               return retval;
 
        /* check header against known signatures */
        if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0)
@@ -343,6 +347,12 @@ int image_elf_read_headers(image_t *image)
 
        elf->header = malloc(sizeof(Elf32_Ehdr));
 
+       if(elf->header == NULL)
+       {
+               LOG_ERROR("insufficient memory to perform operation ");
+               return ERROR_FILEIO_OPERATION_FAILED;
+       }
+
        if ((retval = fileio_read(&elf->fileio, sizeof(Elf32_Ehdr), (u8*)elf->header, &read_bytes)) != ERROR_OK)
        {
                LOG_ERROR("cannot read ELF file header, read failed");
@@ -388,6 +398,11 @@ int image_elf_read_headers(image_t *image)
        }
 
        elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr));
+       if(elf->segments == NULL)
+       {
+               LOG_ERROR("insufficient memory to perform operation ");
+               return ERROR_FILEIO_OPERATION_FAILED;
+       }
 
        if ((retval = fileio_read(&elf->fileio, elf->segment_count*sizeof(Elf32_Phdr), (u8*)elf->segments, &read_bytes)) != ERROR_OK)
        {