diff options
| author | Doug Zongker <dougz@android.com> | 2011-07-13 15:42:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-13 15:42:09 -0700 |
| commit | 8918673cf79f20f0fd9cb735c3ed3510842fc625 (patch) | |
| tree | c8731a078a8c2083887c63c5bc1e407f8c0e16b3 | |
| parent | 8d92ae052e3b244f8a1e5c36ecae1c7268f82a9f (diff) | |
| parent | b2ceb696d02ab0f9f297033820a51fdeac12c0af (diff) | |
| download | bootable_recovery-8918673cf79f20f0fd9cb735c3ed3510842fc625.zip bootable_recovery-8918673cf79f20f0fd9cb735c3ed3510842fc625.tar.gz bootable_recovery-8918673cf79f20f0fd9cb735c3ed3510842fc625.tar.bz2 | |
Merge "Check pointer for null before dereferencing"
| -rw-r--r-- | bootloader.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bootloader.c b/bootloader.c index 7096566..baaddc5 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) { |