blah

libclamav/udf.c

@@ -60,26 +60,28 @@ static cl_error_t writeWholeFile(cli_ctx *ctx, const char *const fileName, const
     }
 
     if (cli_writen(fd, data, dataLen) != dataLen) {
-        cli_warnmsg("iso_scan_file: Can't write to file %s\n", tmpf);
+        cli_warnmsg("writeWholeFile: Can't write to file %s\n", tmpf);
         status = CL_EWRITE;
         goto done;
     }
 
     status = cli_magic_scan_desc(fd, tmpf, ctx, fileName, LAYER_ATTRIBUTES_NONE);
 
-    close(fd);
+done:
+    if (-1 != fd){
+        close(fd);
+        fd = -1;
+    }
     if (!ctx->engine->keeptmp) {
         if (cli_unlink(tmpf)) {
             /* If status is already set to virus or something, that should take priority of the
              * error unlinking the file. */
             if (CL_CLEAN == status) {
                 status = CL_EUNLINK;
             }
-            goto done;
         }
     }
 
-done:
     FREE(tmpf);
 
     return status;