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

chg: converting some more malloc calls -> calloc

Browse source
This commit is contained in:
iceman1001 2018-05-03 19:45:59 +02:00
commit faa6ece881
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdanalyse.c
View file

@ -253,8 +253,8 @@ int CmdAnalyseCRC(const char *Cmd) {
if ( len & 1 ) return usage_analyse_crc(); if ( len & 1 ) return usage_analyse_crc();
// add 1 for null terminator. // add 1 for null terminator.
uint8_t *data = malloc(len+1); uint8_t *data = calloc(len+1, sizeof(uint8_t));
if ( data == NULL ) return 1; if ( !data ) return 1;
if ( param_gethex(Cmd, 0, data, len)) { if ( param_gethex(Cmd, 0, data, len)) {
free(data); free(data);

2
client/fpga_compress.c
View file

@ -134,7 +134,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
// estimate the size of the compressed output // estimate the size of the compressed output
uint32_t outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in); uint32_t outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in);
uint8_t *outbuf = malloc(outsize_max); uint8_t *outbuf = calloc(outsize_max, sizeof(uint8_t));
compressed_fpga_stream.next_out = outbuf; compressed_fpga_stream.next_out = outbuf;
compressed_fpga_stream.avail_out = outsize_max; compressed_fpga_stream.avail_out = outsize_max;

2
client/hid-flasher/flash.c
View file

@ -113,7 +113,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs,
uint32_t new_length = this_end - prev_seg->start; uint32_t new_length = this_end - prev_seg->start;
uint32_t this_offset = paddr - prev_seg->start; uint32_t this_offset = paddr - prev_seg->start;
uint32_t hole = this_offset - prev_seg->length; uint32_t hole = this_offset - prev_seg->length;
uint8_t *new_data = malloc(new_length); uint8_t *new_data = calloc(new_length, sizeof(uint8_t));
if (!new_data) { if (!new_data) {
fprintf(stderr, "Out of memory\n"); fprintf(stderr, "Out of memory\n");
free(data); free(data);