RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-04 03:58:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

hf emrtd info: Fix segfaults on mononyms

Browse source
This commit is contained in:
Ave 2020-12-19 07:01:03 +03:00
parent 333afad302
commit 013a8abcd8
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
client/src/cmdhfemrtd.c
View file

@ -1106,12 +1106,13 @@ static int emrtd_mrz_determine_length(char *mrz, int offset, int max_length) {
static int emrtd_mrz_determine_separator(char *mrz, int offset, int max_length) { static int emrtd_mrz_determine_separator(char *mrz, int offset, int max_length) {
int i; int i;
for (i = max_length; i >= 0; i--) { for (i = max_length; i > 0; i--) {
if (mrz[offset + i - 1] == '<' && mrz[offset + i] == '<') { if (mrz[offset + i - 1] == '<' && mrz[offset + i] == '<') {
break; break;
} }
} }
return i - 1; // Return i - 1 unless we couldn't find anything (in that case return 0).
return i ? i - 1 : 0;
} }
static void emrtd_print_optional_elements(char *mrz, int offset, int length, bool verify_check_digit) { static void emrtd_print_optional_elements(char *mrz, int offset, int length, bool verify_check_digit) {
@ -1139,13 +1140,19 @@ static void emrtd_print_document_number(char *mrz, int offset) {
static void emrtd_print_name(char *mrz, int offset, int max_length, bool localized) { static void emrtd_print_name(char *mrz, int offset, int max_length, bool localized) {
char final_name[100] = { 0x00 }; char final_name[100] = { 0x00 };
int i = emrtd_mrz_determine_length(mrz, offset, max_length); int namelen = emrtd_mrz_determine_length(mrz, offset, max_length);
int sep = emrtd_mrz_determine_separator(mrz, offset, i); int sep = emrtd_mrz_determine_separator(mrz, offset, namelen);
int namelen = (i - (sep + 2));
memcpy(final_name, mrz + offset + sep + 2, namelen); // Account for mononyms
final_name[namelen] = ' '; if (sep != 0) {
memcpy(final_name + namelen + 1, mrz + offset, sep); int firstnamelen = (namelen - (sep + 2));
memcpy(final_name, mrz + offset + sep + 2, firstnamelen);
final_name[firstnamelen] = ' ';
memcpy(final_name + firstnamelen + 1, mrz + offset, sep);
} else {
memcpy(final_name, mrz + offset, namelen);
}
if (localized) { if (localized) {
PrintAndLogEx(SUCCESS, "Legal Name (Localized): " _YELLOW_("%s"), final_name); PrintAndLogEx(SUCCESS, "Legal Name (Localized): " _YELLOW_("%s"), final_name);