minor parsing issue

This commit is contained in:
iceman1001 2024-03-19 11:11:33 +01:00
parent 59bc927698
commit d1d9d00d99
3 changed files with 738 additions and 2 deletions

View file

@ -0,0 +1,729 @@
217F45867C1DA110
7F45867C1DA11042
45867C1DA11042DD
867C1DA11042DD66
7C1DA11042DD66EC
1DA11042DD66EC6C
A11042DD66EC6C67
1042DD66EC6C67F2
42DD66EC6C67F210
DD66EC6C67F210E7
66EC6C67F210E785
EC6C67F210E78530
6C67F210E78530CB
67F210E78530CB94
F210E78530CB941F
10E78530CB941FBD
E78530CB941FBD59
8530CB941FBD5993
30CB941FBD599369
CB941FBD59936949
941FBD59936949B4
1FBD59936949B4C1
BD59936949B4C15B
59936949B4C15B3F
936949B4C15B3FAE
6949B4C15B3FAE7F
49B4C15B3FAE7F61
B4C15B3FAE7F61A8
C15B3FAE7F61A83D
5B3FAE7F61A83DB6
3FAE7F61A83DB655
AE7F61A83DB6554C
7F61A83DB6554C16
61A83DB6554C1617
A83DB6554C1617AA
3DB6554C1617AA1B
B6554C1617AA1B7D
554C1617AA1B7DA8
4C1617AA1B7DA8EA
1617AA1B7DA8EACC
17AA1B7DA8EACC5B
AA1B7DA8EACC5B7C
1B7DA8EACC5B7C62
7DA8EACC5B7C62C4
A8EACC5B7C62C491
EACC5B7C62C491C1
CC5B7C62C491C11B
5B7C62C491C11B39
7C62C491C11B398C
62C491C11B398C00
C491C11B398C000D
91C11B398C000D97
C11B398C000D9719
1B398C000D9719A1
398C000D9719A190
8C000D9719A19023
000D9719A190237B
0D9719A190237BAE
9719A190237BAE13
19A190237BAE13DE
A190237BAE13DEBB
90237BAE13DEBBD8
237BAE13DEBBD810
7BAE13DEBBD810AC
AE13DEBBD810AC40
13DEBBD810AC40BF
DEBBD810AC40BF3F
BBD810AC40BF3FB5
D810AC40BF3FB59F
10AC40BF3FB59F6E
AC40BF3FB59F6E0B
40BF3FB59F6E0B0C
BF3FB59F6E0B0CB4
3FB59F6E0B0CB425
B59F6E0B0CB42542
9F6E0B0CB425428E
6E0B0CB425428EF2
0B0CB425428EF25C
0CB425428EF25C10
B425428EF25C100D
25428EF25C100DF7
428EF25C100DF704
8EF25C100DF7042E
F25C100DF7042EAE
5C100DF7042EAE64
100DF7042EAE6410
0DF7042EAE641057
F7042EAE64105790
042EAE64105790EB
2EAE64105790EB34
AE64105790EB34FC
64105790EB34FCAF
105790EB34FCAFA9
5790EB34FCAFA9ED
90EB34FCAFA9ED38
EB34FCAFA9ED3807
34FCAFA9ED3807B7
FCAFA9ED3807B7C1
AFA9ED3807B7C106
A9ED3807B7C106FC
ED3807B7C106FCFC
3807B7C106FCFCC8
07B7C106FCFCC8B2
B7C106FCFCC8B2F9
C106FCFCC8B2F945
06FCFCC8B2F9456B
FCFCC8B2F9456B8D
FCC8B2F9456B8D58
C8B2F9456B8D5897
B2F9456B8D58976C
F9456B8D58976CE5
456B8D58976CE582
6B8D58976CE582C3
8D58976CE582C326
58976CE582C32634
976CE582C3263457
6CE582C32634573C
E582C32634573C17
82C32634573C1798
C32634573C1798D0
2634573C1798D026
34573C1798D0269B
573C1798D0269B83
3C1798D0269B83E2
1798D0269B83E2AF
98D0269B83E2AFFA
D0269B83E2AFFAB4
269B83E2AFFAB4A6
9B83E2AFFAB4A6A2
83E2AFFAB4A6A2A5
E2AFFAB4A6A2A566
AFFAB4A6A2A566B8
FAB4A6A2A566B839
B4A6A2A566B839BD
A6A2A566B839BDC7
A2A566B839BDC7DC
A566B839BDC7DC33
66B839BDC7DC33D5
B839BDC7DC33D5AB
39BDC7DC33D5ABE8
BDC7DC33D5ABE827
C7DC33D5ABE827F9
DC33D5ABE827F982
33D5ABE827F982DE
D5ABE827F982DE18
ABE827F982DE18EF
E827F982DE18EF87
27F982DE18EF8758
F982DE18EF875849
82DE18EF875849BC
DE18EF875849BC3B
18EF875849BC3B29
EF875849BC3B2953
875849BC3B29536A
5849BC3B29536A12
49BC3B29536A1241
BC3B29536A124174
3B29536A12417409
29536A124174096C
536A124174096CD1
6A124174096CD12A
124174096CD12AF4
4174096CD12AF4C6
74096CD12AF4C6B0
096CD12AF4C6B001
6CD12AF4C6B00155
D12AF4C6B0015532
2AF4C6B0015532FD
F4C6B0015532FDA9
C6B0015532FDA9EC
B0015532FDA9EC04
015532FDA9EC0406
5532FDA9EC04064B
32FDA9EC04064B0C
FDA9EC04064B0CCF
A9EC04064B0CCF69
EC04064B0CCF691D
04064B0CCF691DE6
064B0CCF691DE690
4B0CCF691DE69079
0CCF691DE6907935
CF691DE690793509
691DE69079350928
1DE69079350928E4
E69079350928E49A
9079350928E49A2A
79350928E49A2A10
350928E49A2A1092
0928E49A2A1092A1
28E49A2A1092A121
E49A2A1092A12148
9A2A1092A12148D0
2A1092A12148D077
1092A12148D07735
92A12148D0773590
A12148D0773590AD
2148D0773590ADFA
48D0773590ADFA99
D0773590ADFA99DB
773590ADFA99DBA4
3590ADFA99DBA4CD
90ADFA99DBA4CD36
ADFA99DBA4CD3601
FA99DBA4CD36017C
99DBA4CD36017CAB
DBA4CD36017CABAB
A4CD36017CABABB4
CD36017CABABB46D
36017CABABB46DFB
017CABABB46DFB93
7CABABB46DFB93B5
ABABB46DFB93B584
ABB46DFB93B584A5
B46DFB93B584A506
6DFB93B584A50647
FB93B584A5064748
93B584A506474825
B584A50647482562
84A50647482562E4
A50647482562E49E
0647482562E49EDD
47482562E49EDD4B
482562E49EDD4B30
2562E49EDD4B30EA
62E49EDD4B30EAB0
E49EDD4B30EAB0F0
9EDD4B30EAB0F02B
DD4B30EAB0F02B77
4B30EAB0F02B77CC
30EAB0F02B77CC90
EAB0F02B77CC90AA
B0F02B77CC90AA19
F02B77CC90AA19C7
2B77CC90AA19C73D
77CC90AA19C73D08
CC90AA19C73D0811
90AA19C73D0811EE
AA19C73D0811EEE1
19C73D0811EEE119
C73D0811EEE11930
3D0811EEE11930DA
0811EEE11930DA7E
11EEE11930DA7E5F
EEE11930DA7E5F3F
E11930DA7E5F3F43
1930DA7E5F3F43BA
30DA7E5F3F43BA81
DA7E5F3F43BA819F
7E5F3F43BA819F19
5F3F43BA819F199A
3F43BA819F199AF8
43BA819F199AF82D
BA819F199AF82DD1
819F199AF82DD18E
9F199AF82DD18E0C
199AF82DD18E0C68
9AF82DD18E0C68FD
F82DD18E0C68FDAE
2DD18E0C68FDAEFF
D18E0C68FDAEFFD6
8E0C68FDAEFFD620
0C68FDAEFFD62043
68FDAEFFD6204388
FDAEFFD6204388A3
AEFFD6204388A3C0
FFD6204388A3C089
D6204388A3C08982
204388A3C089828C
4388A3C089828CBD
88A3C089828CBDB3
A3C089828CBDB3E6
C089828CBDB3E6FB
89828CBDB3E6FBE0
828CBDB3E6FBE030
8CBDB3E6FBE030F7
BDB3E6FBE030F774
B3E6FBE030F774B7
E6FBE030F774B72D
FBE030F774B72DBC
E030F774B72DBC2F
30F774B72DBC2FA1
F774B72DBC2FA15B
74B72DBC2FA15BB3
B72DBC2FA15BB307
2DBC2FA15BB30725
BC2FA15BB30725F2
2FA15BB30725F2C4
A15BB30725F2C492
5BB30725F2C49288
B30725F2C49288F5
0725F2C49288F574
25F2C49288F57492
F2C49288F574929E
C49288F574929EB8
9288F574929EB85B
88F574929EB85B8C
F574929EB85B8CE0
74929EB85B8CE0A0
929EB85B8CE0A0D8
9EB85B8CE0A0D8B6
B85B8CE0A0D8B6BF
5B8CE0A0D8B6BF2B
8CE0A0D8B6BF2B03
E0A0D8B6BF2B0316
A0D8B6BF2B031638
D8B6BF2B03163830
B6BF2B03163830E3
BF2B03163830E3E9
2B03163830E3E9A9
03163830E3E9A967
163830E3E9A967E1
3830E3E9A967E142
30E3E9A967E142E3
E3E9A967E142E32B
E9A967E142E32B7D
A967E142E32B7DF3
67E142E32B7DF380
E142E32B7DF3807F
42E32B7DF3807F40
E32B7DF3807F40B0
2B7DF3807F40B076
7DF3807F40B07650
F3807F40B07650F2
807F40B07650F272
7F40B07650F272ED
40B07650F272EDF9
B07650F272EDF90C
7650F272EDF90C1A
50F272EDF90C1A4E
F272EDF90C1A4E0C
72EDF90C1A4E0C70
EDF90C1A4E0C7057
F90C1A4E0C70579D
0C1A4E0C70579D50
1A4E0C70579D5058
4E0C70579D5058C9
0C70579D5058C908
70579D5058C90806
579D5058C908068D
9D5058C908068D67
5058C908068D67C0
58C908068D67C071
C908068D67C071D9
08068D67C071D91E
068D67C071D91E07
8D67C071D91E0795
67C071D91E0795BE
C071D91E0795BEBA
71D91E0795BEBA8A
D91E0795BEBA8A3E
1E0795BEBA8A3E68
0795BEBA8A3E680A
95BEBA8A3E680AF2
BEBA8A3E680AF244
BA8A3E680AF244E1
8A3E680AF244E13F
3E680AF244E13FB6
680AF244E13FB60E
0AF244E13FB60E84
F244E13FB60E8496
44E13FB60E849633
E13FB60E84963355
3FB60E84963355B4
B60E84963355B437
0E84963355B437FE
84963355B437FE2A
963355B437FE2ACD
3355B437FE2ACD5C
55B437FE2ACD5C79
B437FE2ACD5C793B
37FE2ACD5C793B5B
FE2ACD5C793B5BB5
2ACD5C793B5BB5A4
CD5C793B5BB5A452
5C793B5BB5A4528B
793B5BB5A4528B0B
3B5BB5A4528B0B36
5BB5A4528B0B361E
B5A4528B0B361EDE
A4528B0B361EDE24
528B0B361EDE24ED
8B0B361EDE24ED36
0B361EDE24ED3625
361EDE24ED3625E8
1EDE24ED3625E822
DE24ED3625E8225B
24ED3625E8225BA9
ED3625E8225BA9C1
3625E8225BA9C1A0
25E8225BA9C1A0FD
E8225BA9C1A0FDAA
225BA9C1A0FDAA48
5BA9C1A0FDAA48B6
A9C1A0FDAA48B601
C1A0FDAA48B6010B
A0FDAA48B6010B1D
FDAA48B6010B1D8B
AA48B6010B1D8BC2
48B6010B1D8BC24B
B6010B1D8BC24B16
010B1D8BC24B16B2
0B1D8BC24B16B256
1D8BC24B16B256B7
8BC24B16B256B79D
C24B16B256B79DFE
4B16B256B79DFE12
16B256B79DFE12DE
B256B79DFE12DE53
56B79DFE12DE5398
B79DFE12DE539850
9DFE12DE53985046
FE12DE53985046F9
12DE53985046F94E
DE53985046F94E6F
53985046F94E6F5D
985046F94E6F5D91
5046F94E6F5D912E
46F94E6F5D912E1C
F94E6F5D912E1CB2
4E6F5D912E1CB2C0
6F5D912E1CB2C054
5D912E1CB2C054D0
912E1CB2C054D065
2E1CB2C054D06577
1CB2C054D0657700
B2C054D06577009A
C054D06577009ADC
54D06577009ADCD2
D06577009ADCD2EB
6577009ADCD2EB1F
77009ADCD2EB1FB8
009ADCD2EB1FB841
9ADCD2EB1FB841DC
DCD2EB1FB841DCDF
D2EB1FB841DCDF08
EB1FB841DCDF08E5
1FB841DCDF08E576
B841DCDF08E576BA
41DCDF08E576BABC
DCDF08E576BABC3D
DF08E576BABC3D54
08E576BABC3D54B2
E576BABC3D54B25C
76BABC3D54B25C01
BABC3D54B25C0158
BC3D54B25C0158F2
3D54B25C0158F2FA
54B25C0158F2FA4E
B25C0158F2FA4E3F
5C0158F2FA4E3F0F
0158F2FA4E3F0F64
58F2FA4E3F0F6404
F2FA4E3F0F640479
FA4E3F0F6404798F
4E3F0F6404798F9F
3F0F6404798F9F6C
0F6404798F9F6C38
6404798F9F6C38A8
04798F9F6C38A891
798F9F6C38A8911F
8F9F6C38A8911FC7
9F6C38A8911FC749
6C38A8911FC749FE
38A8911FC749FE23
A8911FC749FE231E
911FC749FE231E5E
1FC749FE231E5EB6
C749FE231E5EB656
49FE231E5EB656B3
FE231E5EB656B350
231E5EB656B3500C
1E5EB656B3500C10
5EB656B3500C1092
B656B3500C1092CC
56B3500C1092CC89
B3500C1092CC8904
500C1092CC8904B0
0C1092CC8904B0C6
1092CC8904B0C6E2
92CC8904B0C6E267
CC8904B0C6E2677D
8904B0C6E2677DBD
04B0C6E2677DBD28
B0C6E2677DBD2854
C6E2677DBD2854B8
E2677DBD2854B840
677DBD2854B8403F
7DBD2854B8403F70
BD2854B8403F7087
2854B8403F7087B1
54B8403F7087B191
B8403F7087B191CA
403F7087B191CAC7
3F7087B191CAC749
7087B191CAC74903
87B191CAC7490304
B191CAC7490304A1
91CAC7490304A15C
CAC7490304A15C28
C7490304A15C28B8
490304A15C28B85E
0304A15C28B85EDF
04A15C28B85EDFB5
A15C28B85EDFB515
5C28B85EDFB5157C
28B85EDFB5157C27
B85EDFB5157C2736
5EDFB5157C2736C9
DFB5157C2736C901
B5157C2736C901F3
157C2736C901F3FF
7C2736C901F3FF24
2736C901F3FF240F
36C901F3FF240FAD
C901F3FF240FAD64
01F3FF240FAD647A
F3FF240FAD647AB9
FF240FAD647AB9ED
240FAD647AB9ED2D
0FAD647AB9ED2DC9
AD647AB9ED2DC915
647AB9ED2DC9153F
7AB9ED2DC9153F44
B9ED2DC9153F449B
ED2DC9153F449B92
2DC9153F449B9226
C9153F449B9226B1
153F449B9226B12E
3F449B9226B12E8C
449B9226B12E8C61
9B9226B12E8C61C8
9226B12E8C61C8D3
26B12E8C61C8D31E
B12E8C61C8D31E6C
2E8C61C8D31E6CA1
8C61C8D31E6CA194
61C8D31E6CA19438
C8D31E6CA194384A
D31E6CA194384AC9
1E6CA194384AC919
6CA194384AC919F1
A194384AC919F182
94384AC919F18237
384AC919F18237CC
4AC919F18237CC1E
C919F18237CC1E67
19F18237CC1E6782
F18237CC1E67823C
8237CC1E67823C23
37CC1E67823C239D
CC1E67823C239D50
1E67823C239D50BF
67823C239D50BF09
823C239D50BF09D9
3C239D50BF09D912
239D50BF09D9125C
9D50BF09D9125CD1
50BF09D9125CD1E8
BF09D9125CD1E8EF
09D9125CD1E8EFE8
D9125CD1E8EFE808
125CD1E8EFE808F3
5CD1E8EFE808F3FD
D1E8EFE808F3FD6E
E8EFE808F3FD6E9C
EFE808F3FD6E9C01
E808F3FD6E9C01B7
08F3FD6E9C01B7D4
F3FD6E9C01B7D4EE
FD6E9C01B7D4EEBD
6E9C01B7D4EEBDAC
9C01B7D4EEBDACBC
01B7D4EEBDACBC28
B7D4EEBDACBC287A
D4EEBDACBC287A74
EEBDACBC287A74A9
BDACBC287A74A9D1
ACBC287A74A9D174
BC287A74A9D174E8
287A74A9D174E863
7A74A9D174E8639E
74A9D174E8639E59
A9D174E8639E5992
D174E8639E59929C
74E8639E59929C8C
E8639E59929C8C08
639E59929C8C0863
9E59929C8C0863D3
59929C8C0863D32B
929C8C0863D32B98
9C8C0863D32B98A4
8C0863D32B98A479
0863D32B98A4793D
63D32B98A4793D9C
D32B98A4793D9C2F
2B98A4793D9C2F53
98A4793D9C2F537F
A4793D9C2F537FA5
793D9C2F537FA5DF
3D9C2F537FA5DF1F
9C2F537FA5DF1FC7
2F537FA5DF1FC709
537FA5DF1FC70945
7FA5DF1FC709457A
A5DF1FC709457A4F
DF1FC709457A4FE3
1FC709457A4FE39D
C709457A4FE39D01
09457A4FE39D0151
457A4FE39D01515B
7A4FE39D01515B00
4FE39D01515B00B7
E39D01515B00B7D4
9D01515B00B7D428
01515B00B7D428DA
515B00B7D428DAA6
5B00B7D428DAA6C5
00B7D428DAA6C552
B7D428DAA6C5529F
D428DAA6C5529FC9
28DAA6C5529FC949
DAA6C5529FC9493D
A6C5529FC9493DBA
C5529FC9493DBA2A
529FC9493DBA2A52
9FC9493DBA2A52E3
C9493DBA2A52E3C6
493DBA2A52E3C648
3DBA2A52E3C64870
BA2A52E3C6487061
2A52E3C648706101
52E3C648706101BB
E3C648706101BBEA
C648706101BBEAB5
48706101BBEAB5FE
706101BBEAB5FE1B
6101BBEAB5FE1B0E
01BBEAB5FE1B0EC6
BBEAB5FE1B0EC69A
EAB5FE1B0EC69A1D
B5FE1B0EC69A1DC5
FE1B0EC69A1DC5A4
1B0EC69A1DC5A430
0EC69A1DC5A430FF
C69A1DC5A430FF6A
9A1DC5A430FF6A12
1DC5A430FF6A1211
C5A430FF6A121127
A430FF6A121127DD
30FF6A121127DD42
FF6A121127DD422E
6A121127DD422E07
121127DD422E07D3
1127DD422E07D3DF
27DD422E07D3DF18
DD422E07D3DF1843
422E07D3DF184370
2E07D3DF18437050
07D3DF184370502B
D3DF184370502B16
DF184370502B1617
184370502B16173C
4370502B16173C05
70502B16173C05F1
502B16173C05F181
2B16173C05F18149
16173C05F181493D
173C05F181493D66
3C05F181493D660C
05F181493D660C2A
F181493D660C2A52
81493D660C2A5245
493D660C2A524556
3D660C2A524556D8
660C2A524556D8E2
0C2A524556D8E205
2A524556D8E2050B
524556D8E2050B1F
4556D8E2050B1F1D
56D8E2050B1F1D65
D8E2050B1F1D65FB
E2050B1F1D65FB5D
050B1F1D65FB5D78
0B1F1D65FB5D7852
1F1D65FB5D785270
1D65FB5D78527086
65FB5D78527086A6
FB5D78527086A60C
5D78527086A60CBE
78527086A60CBE6C
527086A60CBE6CC4
7086A60CBE6CC485
86A60CBE6CC4851B
A60CBE6CC4851B3E
0CBE6CC4851B3ED4
BE6CC4851B3ED409
6CC4851B3ED409B1
C4851B3ED409B14E
851B3ED409B14E6C
1B3ED409B14E6C24
3ED409B14E6C24F2
D409B14E6C24F217
09B14E6C24F217AF
B14E6C24F217AFC1
4E6C24F217AFC12C
6C24F217AFC12C7E
24F217AFC12C7E7D
F217AFC12C7E7D8F
17AFC12C7E7D8F5D
AFC12C7E7D8F5D58
C12C7E7D8F5D58E7
2C7E7D8F5D58E7A9
7E7D8F5D58E7A948
7D8F5D58E7A9482D
8F5D58E7A9482DE6
5D58E7A9482DE675
58E7A9482DE675C8
E7A9482DE675C83B
A9482DE675C83B4C
482DE675C83B4CCC
2DE675C83B4CCC65
E675C83B4CCC65BE
75C83B4CCC65BEFA
C83B4CCC65BEFA5C
3B4CCC65BEFA5C25
4CCC65BEFA5C256F
CC65BEFA5C256F54
65BEFA5C256F544B
BEFA5C256F544BA4

View file

@ -44,7 +44,10 @@ static int openAIDFile(json_t **root, bool verbose) {
goto out;
}
PrintAndLogEx(DEBUG, "Loaded file " _YELLOW_("%s") " " _GREEN_("%zu") " records ( " _GREEN_("ok") " )", path, json_array_size(*root));
PrintAndLogEx(DEBUG, "Loaded file " _YELLOW_("%s") " " _GREEN_("%zu") " records ( " _GREEN_("ok") " )"
, path
, json_array_size(*root)
);
out:
free(path);
return retval;

View file

@ -468,7 +468,11 @@ static int CmdFlashMemInfo(const char *Cmd) {
// shall_write = arg_get_lit(ctx, 5);
CLIParserFree(ctx);
if (res || (dlen > 0 && dlen < sizeof(id))) {
if (res) {
return PM3_EINVARG;
}
if (dlen > 0 && dlen < sizeof(id)) {
PrintAndLogEx(FAILED, "Error parsing flash memory id, expect 8, got %d", dlen);
return PM3_EINVARG;
}