github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2526 from douniwan5788/lfsearch_hangs

Browse source 
fix: `lf search` hangs
This commit is contained in:
Iceman 2024-09-22 10:29:14 +03:00 • committed by GitHub
commit 0476596524
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
armsrc/hitag2.c
View file

@ -1953,9 +1953,10 @@ void ReaderHitag(const lf_hitag_data_t *payload, bool ledcontrol) {
memset(rx, 0x00, sizeof(rx));
rxlen = 0;
// If there is no response, just repeat the loop
// If there is no response
if (detected_tag_modulation == false) {
continue;
checked = -1;
goto out;
}
// Make sure we always have an even number of samples. This fixes the problem

2
client/src/cmdlf.c
View file

@ -1569,7 +1569,7 @@ static bool check_chiptype(bool getDeviceData) {
//check for em4x05/em4x69 chips first
uint32_t word = 0;
if (em4x05_isblock0(&word)) {
if (IfPm3EM4x50() && em4x05_isblock0(&word)) {
PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("EM4x05 / EM4x69"));
PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 4x05`") " commands");
retval = true;