From 8dcc336e04db84f881a553706c35aeb4ea7dfc20 Mon Sep 17 00:00:00 2001 From: joerg_wunsch Date: Fri, 28 Feb 2014 14:24:48 +0000 Subject: [PATCH] In jtag3_recv, avoid memmov'ing more data than available git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1286 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 4 ++++ jtag3.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dd17bdf3..af7f399b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-28 Joerg Wunsch + + * jtag3.c (jtag3_recv): avoid memmov'ing more data than available + 2014-02-27 Joerg Wunsch * avrdude.1: Documentation update for EDBG. diff --git a/jtag3.c b/jtag3.c index fa092572..f388dfa9 100644 --- a/jtag3.c +++ b/jtag3.c @@ -758,8 +758,8 @@ int jtag3_recv(PROGRAMMER * pgm, unsigned char **msg) { * the job easier for the caller. We have to return the * original pointer though, as the caller must free() it. */ - memmove(*msg, *msg + 3, rv); rv -= 3; + memmove(*msg, *msg + 3, rv); return rv; }