Skip to content

Commit 66e3617

Browse files
committed
Merge branch 'fz-dev' into dev
2 parents 293d5f7 + ab4bb55 commit 66e3617

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

applications/nfc/helpers/nfc_generators.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static void
254254
session_register_page = 234;
255255
break;
256256
default:
257-
furi_assert(false);
257+
furi_crash("Unknown MFUL");
258258
break;
259259
}
260260

lib/nfc/protocols/mifare_ultralight.c

+4-7
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ static bool mf_ul_check_lock(MfUltralightEmulator* emulator, int16_t write_page)
940940
if(write_page >= 512) return true;
941941
break;
942942
default:
943-
furi_assert(false);
943+
furi_crash("Unknown MFUL");
944944
return true;
945945
}
946946

@@ -967,8 +967,7 @@ static bool mf_ul_check_lock(MfUltralightEmulator* emulator, int16_t write_page)
967967
else if(write_page == 41)
968968
shift = 12;
969969
else {
970-
furi_assert(false);
971-
shift = 0;
970+
furi_crash("Unknown MFUL");
972971
}
973972

974973
break;
@@ -999,8 +998,7 @@ static bool mf_ul_check_lock(MfUltralightEmulator* emulator, int16_t write_page)
999998
shift = (write_page - 16) / 32;
1000999
break;
10011000
default:
1002-
furi_assert(false);
1003-
shift = 0;
1001+
furi_crash("Unknown MFUL");
10041002
break;
10051003
}
10061004

@@ -1177,8 +1175,7 @@ static void mf_ul_emulate_write(
11771175
block_lock_count = 8;
11781176
break;
11791177
default:
1180-
furi_assert(false);
1181-
block_lock_count = 0;
1178+
furi_crash("Unknown MFUL");
11821179
break;
11831180
}
11841181

0 commit comments

Comments
 (0)