diff --git a/[refs] b/[refs]
index 331c22b535b6..ce60b5fc8dfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4f81dce93774a447da3ceb98cce193ef84a3fa
+refs/heads/master: 6c356634111c5a7a48264d7c9ec28559e4be11a2
diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c
index e5ab51fc2d9e..99747a58ec72 100644
--- a/trunk/lib/vsprintf.c
+++ b/trunk/lib/vsprintf.c
@@ -1496,13 +1496,14 @@ 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)";
-			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;
 		}