From: Darwin Rambo <drambo@broadcom.com>
Date: Thu, 19 Dec 2013 23:14:19 +0000 (-0800)
Subject: lib: fix return codes when CONFIG_SYS_VSNPRINTF is enabled
X-Git-Tag: v2014.04-rc1~150
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=686f60f519a3b06dfc4571cfb0dd832467179479;p=u-boot

lib: fix return codes when CONFIG_SYS_VSNPRINTF is enabled

When CONFIG_SYS_VSNPRINTF is enabled, it protects print operations
such as sprintf, snprintf, vsnprintf, etc., from buffer overflows.
But vsnprintf_internal includes the terminating NULL character in
the calculation of number of characters written. This affects sprintf
and snprintf return values. Fix this issue by setting pointer 'str'
back to the location of the '\0'.

Signed-off-by: Darwin Rambo <drambo@broadcom.com>
Reviewed-by: Steve Rae <srae@broadcom.com>
---

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 82e5c13653..60874dae3e 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -750,6 +750,7 @@ repeat:
 		ADDCH(str, '\0');
 		if (str > end)
 			end[-1] = '\0';
+		--str;
 	}
 #else
 	*str = '\0';