summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2017-08-24 13:59:29 -0400
committer GitHub <noreply@github.com>2017-08-24 13:59:29 -0400
commit209d723e8423074f51a1c28c2b8f145e6f480869 (patch)
treee4a00bc9b8b9a7556a66ece0d2b0aa36b3c099f5
parent5884795e76cdf3b3786e72c16bbf420c0b16cba5 (diff)
parent5f7e815d3341c164128d7cfc42aece02f60ddb32 (diff)
Merge pull request #2594 from fulivi/hp80_dev02
imgtool: a fix for the "GET" command bug
-rw-r--r--src/tools/imgtool/imgtool.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp
index f4a41246495..52d4b23c759 100644
--- a/src/tools/imgtool/imgtool.cpp
+++ b/src/tools/imgtool/imgtool.cpp
@@ -1750,7 +1750,6 @@ imgtoolerr_t imgtool::partition::get_file(const char *filename, const char *fork
{
imgtoolerr_t err;
imgtool::stream::ptr f;
- char *new_fname = nullptr;
char *alloc_dest = nullptr;
const char *filter_extension = nullptr;
@@ -1785,15 +1784,11 @@ imgtoolerr_t imgtool::partition::get_file(const char *filename, const char *fork
goto done;
}
- err = read_file(new_fname, fork, *f, filter);
- if (err)
- goto done;
+ err = read_file(filename, fork, *f, filter);
done:
if (alloc_dest != nullptr)
free(alloc_dest);
- if (new_fname != nullptr)
- free(new_fname);
return err;
}