Close dangling file handle

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

diff --git a/src/target/image.c b/src/target/image.c
index 1eb956728f58c8b45cbca1162177b8aa627b1e99..72a3828c36f0cbadef4b75b75d9f373f5962d93a 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)