* [PATCH v2 2/7] vsprintf: pre-calculate final string length
@ 2009-11-02 17:26 André Goddard Rosa
0 siblings, 0 replies; only message in thread
From: André Goddard Rosa @ 2009-11-02 17:26 UTC (permalink / raw)
To: Frederic Weisbecker, laijs, mingo, davem, akpm, harvey.harrison,
linux list
Cc: me
>From ad7ae7336da94fd87f8a2ef48ded02849d8f2e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= <andre.goddard@gmail.com>
Date: Sun, 1 Nov 2009 12:21:50 -0200
Subject: [PATCH v2 2/7] vsprintf: pre-calculate final string length
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
---
lib/vsprintf.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 002f462..403e835 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1445,13 +1445,15 @@ do { \
case FORMAT_TYPE_STR: {
const char *save_str = va_arg(args, char *);
size_t len;
+
if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
|| (unsigned long)save_str < PAGE_SIZE)
save_str = null_str;
- len = strlen(save_str);
- if (str + len + 1 < end)
- memcpy(str, save_str, len + 1);
- str += len + 1;
+ len = strlen(save_str) + 1;
+ if (str + len < end)
+ memcpy(str, save_str, len);
+ str += len;
+
break;
}
--
1.6.5.2.140.g5f809
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-02 17:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-02 17:26 [PATCH v2 2/7] vsprintf: pre-calculate final string length André Goddard Rosa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®