Merge pull request #2892 from jmichelp/patch-4

Rollback em4x50_read() to remove a segv
This commit is contained in:
Iceman 2025-06-08 21:26:29 +02:00 committed by GitHub
commit 1a6c38ab20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -639,10 +639,8 @@ int em4x50_read(em4x50_data_t *etd, em4x50_word_t *out) {
return PM3_ESOFT; return PM3_ESOFT;
} }
em4x50_read_data_response_t *o = (em4x50_read_data_response_t *)resp.data.asBytes;
em4x50_word_t words[EM4X50_NO_WORDS] = {0}; em4x50_word_t words[EM4X50_NO_WORDS] = {0};
em4x50_prepare_result((uint8_t *)o->words, etd->addresses & 0xFF, (etd->addresses >> 8) & 0xFF, words); em4x50_prepare_result(resp.data.asBytes, etd->addresses & 0xFF, (etd->addresses >> 8) & 0xFF, words);
if (out != NULL) { if (out != NULL) {
memcpy(out, &words, sizeof(em4x50_word_t) * EM4X50_NO_WORDS); memcpy(out, &words, sizeof(em4x50_word_t) * EM4X50_NO_WORDS);