Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ceb696 authored by Adam Bliss's avatar Adam Bliss
Browse files

Check pointer for null before dereferencing 

Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91
parent 28a08efe

bootloader.c

+8 −0
Original line number Diff line number Diff line
@@ -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) {