RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-15 11:43:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: mem leaks.

Browse source
This commit is contained in:
iceman1001 2019-02-21 15:34:31 +01:00
parent 06ade9970a
commit 91d6836a47
7 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/cmdhffelica.c
View file

@ -299,10 +299,10 @@ uint16_t PrintFliteBlock(uint16_t tracepos, uint8_t *trace,uint16_t tracelen) {
char idm[20]; char idm[20];
char pmm[20]; char pmm[20];
for (int j = 0; j < 8; j++) for (int j = 0; j < 8; j++)
snprintf(idm+( j * 2),20, "%02x", trace[j+3]); snprintf(idm + (j * 2), 20, "%02x", trace[j+3]);
for (int j = 0; j < 8; j++) for (int j = 0; j < 8; j++)
snprintf(pmm+( j * 2),20, "%02x", trace[j+11]); snprintf(pmm + (j * 2), 20, "%02x", trace[j+11]);
PrintAndLogEx(NORMAL, "DeviceId: IDm: 0x%s PMm: 0x%s ", idm, pmm); PrintAndLogEx(NORMAL, "DeviceId: IDm: 0x%s PMm: 0x%s ", idm, pmm);
} }

4
client/cmdhficlass.c
View file

@ -2162,10 +2162,10 @@ static int cmp_uint32( const void *a, const void *b) {
int CmdHFiClassLookUp(const char *Cmd) { int CmdHFiClassLookUp(const char *Cmd) {
uint8_t CSN[8]; uint8_t CSN[8];
uint8_t EPURSE[8]; uint8_t EPURSE[8] = { 0,0,0,0,0,0,0,0 };
uint8_t MACS[8]; uint8_t MACS[8];
uint8_t CCNR[12]; uint8_t CCNR[12];
uint8_t MAC_TAG[4] = {0x00,0x00,0x00,0x00}; uint8_t MAC_TAG[4] = { 0,0,0,0 };
// elite key, raw key, standard key // elite key, raw key, standard key
bool use_elite = false; bool use_elite = false;

1
client/cmdhflegic.c
View file

@ -1022,6 +1022,7 @@ int CmdLegicRestore(const char *Cmd){
f = fopen(filename,"rb"); f = fopen(filename,"rb");
if (!f) { if (!f) {
PrintAndLogEx(WARNING, "File %s not found or locked", filename); PrintAndLogEx(WARNING, "File %s not found or locked", filename);
free(data);
return 3; return 3;
} }

10
client/cmdhfmfhard.c
View file

@ -266,14 +266,20 @@ static void init_bitflip_bitarrays(void)
continue; continue;
} else { } else {
fseek(statesfile, 0, SEEK_END); fseek(statesfile, 0, SEEK_END);
uint32_t filesize = (uint32_t)ftell(statesfile); int fsize = ftell(statesfile);
if ( fsize == -1 ){
PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
fclose(statesfile);
exit(5);
}
uint32_t filesize = (uint32_t)fsize;
rewind(statesfile); rewind(statesfile);
uint8_t input_buffer[filesize]; uint8_t input_buffer[filesize];
size_t bytesread = fread(input_buffer, 1, filesize, statesfile); size_t bytesread = fread(input_buffer, 1, filesize, statesfile);
if (bytesread != filesize) { if (bytesread != filesize) {
PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name); PrintAndLogEx(WARNING, "File read error with %s. Aborting...\n", state_file_name);
fclose(statesfile); fclose(statesfile);
inflateEnd(&compressed_stream); //inflateEnd(&compressed_stream);
exit(5); exit(5);
} }
fclose(statesfile); fclose(statesfile);

2
client/emv/cmdemv.c
View file

@ -284,6 +284,7 @@ int CmdEMVGPO(const char *cmd) {
if (!pdol_data_tlv_data) { if (!pdol_data_tlv_data) {
PrintAndLogEx(ERR, "Can't create PDOL data."); PrintAndLogEx(ERR, "Can't create PDOL data.");
tlvdb_free(tlvRoot); tlvdb_free(tlvRoot);
free(pdol_data_tlv);
return 4; return 4;
} }
PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len)); PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));
@ -296,6 +297,7 @@ int CmdEMVGPO(const char *cmd) {
if (pdol_data_tlv != &data_tlv) if (pdol_data_tlv != &data_tlv)
free(pdol_data_tlv); free(pdol_data_tlv);
tlvdb_free(tlvRoot); tlvdb_free(tlvRoot);
if (sw) if (sw)

6
client/emv/emv_pk.c
View file

@ -429,9 +429,6 @@ char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsig
if (!dirname) if (!dirname)
dirname = ".";//openemv_config_get_str("capk.dir", NULL); dirname = ".";//openemv_config_get_str("capk.dir", NULL);
if (!dirname)
return NULL;
char *filename; char *filename;
int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0", int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0",
dirname, dirname,
@ -453,9 +450,6 @@ char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid)
if (!dirname) if (!dirname)
dirname = "."; //openemv_config_get_str("capk.dir", NULL); dirname = "."; //openemv_config_get_str("capk.dir", NULL);
if (!dirname)
return NULL;
char *filename; char *filename;
int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks", int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks",
dirname, dirname,

9
client/hardnested/hardnested_bruteforce.c
View file

@ -311,6 +311,11 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
uint64_t start_time = msclock(); uint64_t start_time = msclock();
#if defined(__linux__) || defined(__APPLE__)
if ( NUM_BRUTE_FORCE_THREADS < 0 )
return false;
#endif
pthread_t threads[NUM_BRUTE_FORCE_THREADS]; pthread_t threads[NUM_BRUTE_FORCE_THREADS];
struct args { struct args {
bool silent; bool silent;
@ -322,7 +327,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
uint8_t *best_first_bytes; uint8_t *best_first_bytes;
} thread_args[NUM_BRUTE_FORCE_THREADS]; } thread_args[NUM_BRUTE_FORCE_THREADS];
for(uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){ for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
thread_args[i].thread_ID = i; thread_args[i].thread_ID = i;
thread_args[i].silent = silent; thread_args[i].silent = silent;
thread_args[i].cuid = cuid; thread_args[i].cuid = cuid;
@ -332,7 +337,7 @@ bool brute_force_bs(float *bf_rate, statelist_t *candidates, uint32_t cuid, uint
thread_args[i].best_first_bytes = best_first_bytes; thread_args[i].best_first_bytes = best_first_bytes;
pthread_create(&threads[i], NULL, crack_states_thread, (void*)&thread_args[i]); pthread_create(&threads[i], NULL, crack_states_thread, (void*)&thread_args[i]);
} }
for(uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){ for (uint32_t i = 0; i < NUM_BRUTE_FORCE_THREADS; i++){
pthread_join(threads[i], 0); pthread_join(threads[i], 0);
} }