webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-06-11 21:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix related with reallocation under some optimization situations.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-10-05 09:33:18 +02:00
parent 8f14db677e
commit e5fe638c68
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/fs/file.c
View File

@@ -395,10 +395,17 @@ int meta_add(uint16_t fid, const uint8_t *data, uint16_t len) {
uint8_t *tpos = p-asn1_len_tag(tag, tag_len); uint8_t *tpos = p-asn1_len_tag(tag, tag_len);
memmove(tpos, p, fdata+ef_size-p); memmove(tpos, p, fdata+ef_size-p);
tpos += fdata+ef_size-p; tpos += fdata+ef_size-p;
uintptr_t meta_offset = tpos-fdata; volatile uintptr_t meta_offset = tpos-fdata;
ef_size += len - (tag_len-2); ef_size += len - (tag_len-2);
if (len > tag_len-2) if (len > tag_len-2) {
fdata = (uint8_t *)realloc(fdata, ef_size); uint8_t *fdata_new = (uint8_t *)realloc(fdata, ef_size);
if (fdata_new != NULL)
fdata = fdata_new;
else {
free(fdata);
return CCID_ERR_MEMORY_FATAL;
}
}
uint8_t *f = fdata+meta_offset; uint8_t *f = fdata+meta_offset;
*f++ = fid & 0xff; *f++ = fid & 0xff;
f += format_tlv_len(len+2, f); f += format_tlv_len(len+2, f);