[coreboot-gerrit] Patch set updated for coreboot: 6a762b8 util/cbmem: Don't output trailing garbage for cbmemc

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2991

-gerrit

commit 6a762b8c0fd53424454763f44731611b730b6833
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Sat Mar 30 12:15:12 2013 +0100

    util/cbmem: Don't output trailing garbage for cbmemc
    
    Current code outputs the whole cbmemc buffer even if only part of
    it is really used. Fix it to output only the used part and notify
    the user if the buffer was too small for the required data.
    
    Change-Id: I68c1970cf84d49b2d7d6007dae0679d7a7a0cb99
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 util/cbmem/cbmem.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index bc6bd6b..f3f5add 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -314,6 +314,7 @@ static void dump_console(void)
 	void *console_p;
 	char *console_c;
 	uint32_t size;
+	uint32_t cursor;
 
 	if (console.tag != LB_TAG_CBMEM_CONSOLE) {
 		fprintf(stderr, "No console found in coreboot table.\n");
@@ -328,6 +329,12 @@ static void dump_console(void)
 	 * Hence we have to add 8 to get to the actual console string.
 	 */
 	size = *(uint32_t *)console_p;
+	cursor = *(uint32_t *) (console_p + 4);
+	/* Cursor continues to go on even after no more data fits in
+	 * the buffer but the data is dropped in this case.
+	 */
+	if (size > cursor)
+		size = cursor;
 	console_c = malloc(size + 1);
 	if (!console_c) {
 		fprintf(stderr, "Not enough memory for console.\n");
@@ -337,7 +344,10 @@ static void dump_console(void)
 	memcpy(console_c, console_p + 8, size);
 	console_c[size] = 0;
 
-	printf("%s", console_c);
+	printf("%s\n", console_c);
+	if (size < cursor)
+		printf("%d %s lost\n", cursor - size,
+			(cursor - size) == 1 ? "byte":"bytes");
 
 	free(console_c);