upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-14 22:30:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-non-portable' into 'master'

Browse source 
use sizeof(CK_SLOT_ID)

See merge request isc-projects/bind9!588
This commit is contained in:
Mark Andrews 2018-08-23 21:29:52 -04:00
commit 1c82dde85c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
5018. [bug] Fix incorrect sizeof arguments in lib/isc/pk11.c.
[GL !588]
5017. [bug] lib/isc/pk11.c failed to unlink the session before
releasing the lock which is unsafe. [GL !589]

4
lib/isc/pk11.c
View file

@ -484,7 +484,7 @@ scan_slots(void) {
/* it's not an error if we didn't find any providers */
if (slotCount == 0)
return;
slotList = pk11_mem_get(sizeof(CK_SLOT_ID_PTR) * slotCount);
slotList = pk11_mem_get(sizeof(CK_SLOT_ID) * slotCount);
RUNTIME_CHECK(slotList != NULL);
PK11_FATALCHECK(pkcs_C_GetSlotList, (CK_FALSE, slotList, &slotCount));
@ -671,7 +671,7 @@ scan_slots(void) {
}
if (slotList != NULL) {
pk11_mem_put(slotList, sizeof(CK_SLOT_ID_PTR) * slotCount);
pk11_mem_put(slotList, sizeof(CK_SLOT_ID) * slotCount);
}
}