[libvirt] [PATCH] Fix logging buffer overrun read
* src/logging.c: Fix buffer offset in logging read --- src/logging.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/logging.c b/src/logging.c index e46e2be..07c2b0e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -240,7 +240,7 @@ static void virLogStr(const char *str, int len) { tmp = LOG_BUFFER_SIZE - virLogEnd; memcpy(&virLogBuffer[virLogEnd], str, tmp); virLogBuffer[LOG_BUFFER_SIZE] = 0; - memcpy(&virLogBuffer[0], &str[len], len - tmp); + memcpy(&virLogBuffer[0], &str[tmp], len - tmp); virLogEnd = len - tmp; } else { memcpy(&virLogBuffer[virLogEnd], str, len); -- 1.6.2.5
Daniel P. Berrange wrote:
* src/logging.c: Fix buffer offset in logging read --- src/logging.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/logging.c b/src/logging.c index e46e2be..07c2b0e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -240,7 +240,7 @@ static void virLogStr(const char *str, int len) { tmp = LOG_BUFFER_SIZE - virLogEnd; memcpy(&virLogBuffer[virLogEnd], str, tmp); virLogBuffer[LOG_BUFFER_SIZE] = 0; - memcpy(&virLogBuffer[0], &str[len], len - tmp); + memcpy(&virLogBuffer[0], &str[tmp], len - tmp);
Ack. Definitely. valgrind?
On Thu, Sep 03, 2009 at 05:39:24PM +0100, Daniel P. Berrange wrote:
* src/logging.c: Fix buffer offset in logging read --- src/logging.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/logging.c b/src/logging.c index e46e2be..07c2b0e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -240,7 +240,7 @@ static void virLogStr(const char *str, int len) { tmp = LOG_BUFFER_SIZE - virLogEnd; memcpy(&virLogBuffer[virLogEnd], str, tmp); virLogBuffer[LOG_BUFFER_SIZE] = 0; - memcpy(&virLogBuffer[0], &str[len], len - tmp); + memcpy(&virLogBuffer[0], &str[tmp], len - tmp); virLogEnd = len - tmp; } else { memcpy(&virLogBuffer[virLogEnd], str, len);
Whoops, that's mine :-\ ACK ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (3)
-
Daniel P. Berrange -
Daniel Veillard -
Jim Meyering