From b2ceb696d02ab0f9f297033820a51fdeac12c0af Mon Sep 17 00:00:00 2001 From: Adam Bliss Date: Wed, 13 Jul 2011 15:13:54 -0700 Subject: Check pointer for null before dereferencing Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91 --- bootloader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bootloader.c b/bootloader.c index 709656602..baaddc55f 100644 --- a/bootloader.c +++ b/bootloader.c @@ -32,6 +32,10 @@ static int set_bootloader_message_block(const struct bootloader_message *in, con 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 get_bootloader_message(struct bootloader_message *out) { 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) { -- cgit v1.2.3