commit b2ceb696d02ab0f9f297033820a51fdeac12c0af
author Adam Bliss <abliss@google.com> Wed Jul 13 15:13:54 2011 -0700
committer Adam Bliss <abliss@google.com> Wed Jul 13 15:24:38 2011 -0700
tree d50097758848e4ac9ac7710efaaeb530fdc42943
parent 28a08efe15fc14bf1f4937024d4b73cf299313e5

Check pointer for null before dereferencing

Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91

bootloader.c

diff --git a/bootloader.c b/bootloader.c
index 7096566..baaddc5 100644
--- a/bootloader.c
+++ b/bootloader.c
@@ -32,6 +32,10 @@
 
 int get_bootloader_message(struct bootloader_message *out) {
     Volume* v = volume_for_path("/misc");
+    if (v == NULL) {
+      LOGE("Cannot load volume /misc!\n");
+      return -1;
+    }
     if (strcmp(v->fs_type, "mtd") == 0) {
         return get_bootloader_message_mtd(out, v);
     } else if (strcmp(v->fs_type, "emmc") == 0) {
@@ -43,6 +47,10 @@
 
 int set_bootloader_message(const struct bootloader_message *in) {
     Volume* v = volume_for_path("/misc");
+    if (v == NULL) {
+      LOGE("Cannot load volume /misc!\n");
+      return -1;
+    }
     if (strcmp(v->fs_type, "mtd") == 0) {
         return set_bootloader_message_mtd(in, v);
     } else if (strcmp(v->fs_type, "emmc") == 0) {