commit 87c5f9ca0e11c858140a3f4024dc040c42e59b9f
author Linux Build Service Account <lnxbuild@localhost> Fri May 10 15:22:16 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 10 15:22:16 2013 -0700
tree cb1be368e94d55d625c9e0f91c37637de7c4f92c
parent bf3e72a803940285b5b8b90263e5638cdc2c0a48
parent 96a9aea67b417ccf6496f1e5ca3c64e082a22470

Merge "recovery: Fix potential dprintf issue"

app/aboot/recovery.c

diff --git a/app/aboot/recovery.c b/app/aboot/recovery.c
index e0ba875..c96490f 100644
--- a/app/aboot/recovery.c
+++ b/app/aboot/recovery.c
@@ -297,10 +297,11 @@
 	// get recovery message
 	if (get_recovery_message(&msg))
 		return -1;
-	if (msg.command[0] != 0 && msg.command[0] != 255) {
-		dprintf(INFO, "Recovery command: %.*s\n", sizeof(msg.command), msg.command);
-	}
 	msg.command[sizeof(msg.command)-1] = '\0'; //Ensure termination
+	if (msg.command[0] != 0 && msg.command[0] != 255) {
+		dprintf(INFO,"Recovery command: %d %s\n",
+			sizeof(msg.command), msg.command);
+	}
 
 	if (!strcmp("boot-recovery",msg.command))
 	{
@@ -431,10 +432,11 @@
 	// get recovery message
 	if(emmc_get_recovery_msg(&msg))
 		return -1;
-	if (msg.command[0] != 0 && msg.command[0] != 255) {
-		dprintf(INFO,"Recovery command: %d %s\n", sizeof(msg.command), msg.command);
-	}
 	msg.command[sizeof(msg.command)-1] = '\0'; //Ensure termination
+	if (msg.command[0] != 0 && msg.command[0] != 255) {
+		dprintf(INFO,"Recovery command: %d %s\n",
+			sizeof(msg.command), msg.command);
+	}
 
 	if (!strncmp(msg.command, "boot-recovery", strlen("boot-recovery"))) {
 		boot_into_recovery = 1;