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

Merge pull request #2599 from douniwan5788/fix_concatbits

Browse source 
fix: concatbits erase out-of-bound
This commit is contained in:
Iceman 2024-10-28 16:08:08 +01:00 • committed by GitHub
commit f9ddb7b3a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
common/commonutil.c
View file

@ -544,18 +544,26 @@ void reverse_arraybytes_copy(uint8_t *arr, uint8_t *dest, size_t len) {
} }
} }
// TODO: consider overlap, Implement _membitmovebb // TODO: Boost performance by copying in chunks of 1, 2, or 4 bytes when feasible.
size_t concatbits(uint8_t *dst, size_t dstskip, const uint8_t *src, size_t srcstart, size_t srclen) { size_t concatbits(uint8_t *dest, int dest_offset, const uint8_t *src, int src_offset, size_t nbits) {
// erase dstbuf bits that will be overriden int i, end, step;
dst[dstskip / 8] &= 0xFF - ((1 << (7 - (dstskip % 8) + 1)) - 1);
for (size_t i = (dstskip / 8) + 1; i <= (dstskip + srclen) / 8; i++) { // overlap
dst[i] = 0; if ((src - dest) * 8 + src_offset - dest_offset > 0) {
i = 0;
end = nbits;
step = 1;
} else {
i = nbits;
end = 0;
step = -1;
} }
for (size_t i = 0; i < srclen; i++) { for (; i != end; i += step) {
// equiv of dstbufbits[dstbufskip + i] = srcbufbits[srcbufstart + i] // equiv of dest_bits[dest_offset + i] = src_bits[src_offset + i]
dst[(dstskip + i) / 8] |= ((src[(srcstart + i) / 8] >> (7 - ((srcstart + i) % 8))) & 1) << (7 - ((dstskip + i) % 8)); CLEAR_BIT(dest, dest_offset + i);
if (TEST_BIT(src, src_offset + i)) SET_BIT(dest, dest_offset + i);
} }
return dstskip + srclen; return dest_offset + nbits;
} }

2
common/commonutil.h
View file

@ -135,5 +135,5 @@ bool hexstr_to_byte_array(const char *hexstr, uint8_t *d, size_t *n);
void reverse_arraybytes(uint8_t *arr, size_t len); void reverse_arraybytes(uint8_t *arr, size_t len);
void reverse_arraybytes_copy(uint8_t *arr, uint8_t *dest, size_t len); void reverse_arraybytes_copy(uint8_t *arr, uint8_t *dest, size_t len);
size_t concatbits(uint8_t *dst, size_t dstskip, const uint8_t *src, size_t srcstart, size_t srclen); size_t concatbits(uint8_t *dest, int dest_offset, const uint8_t *src, int src_offset, size_t nbits);
#endif #endif