Merge "Check pointer for null before dereferencing" (8918673c) · Commits · e / tools / etwrp

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) {