diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 784b0de..f8cc588 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -2263,7 +2263,7 @@
 
 	/* wipe data */
 	struct recovery_message msg;
-
+	memset(&msg, 0, sizeof(msg));
 	snprintf(msg.recovery, sizeof(msg.recovery), "recovery\n--wipe_data");
 	write_misc(0, &msg, sizeof(msg));
 
@@ -3508,7 +3508,7 @@
 
 		/* wipe data */
 		struct recovery_message msg;
-
+	        memset(&msg, 0, sizeof(msg));
 		snprintf(msg.recovery, sizeof(msg.recovery), "recovery\n--wipe_data");
 		write_misc(0, &msg, sizeof(msg));
 
diff --git a/platform/msm_shared/menu_keys_detect.c b/platform/msm_shared/menu_keys_detect.c
index 8ffbacb..3a81b70 100644
--- a/platform/msm_shared/menu_keys_detect.c
+++ b/platform/msm_shared/menu_keys_detect.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
@@ -45,6 +45,7 @@
 #include <sys/types.h>
 #include <../../../app/aboot/recovery.h>
 #include <../../../app/aboot/devinfo.h>
+#include <string.h>
 
 #define KEY_DETECT_FREQUENCY		50
 
@@ -128,6 +129,7 @@
 				/* wipe data */
 				struct recovery_message msg;
 
+				memset(&msg, 0, sizeof(msg));
 				snprintf(msg.recovery, sizeof(msg.recovery), "recovery\n--wipe_data");
 				write_misc(0, &msg, sizeof(msg));
 			}
@@ -154,6 +156,7 @@
 
 			break;
 		case FFBM:
+			memset(&ffbm_page_buffer, 0, sizeof(ffbm_page_buffer));
 			snprintf(ffbm_page_buffer, sizeof(ffbm_page_buffer), "ffbm-00");
 			write_misc(0, ffbm_page_buffer, sizeof(ffbm_page_buffer));