Skip to content

Commit e325957

Browse files
committed
8361868: [GCC static analyzer] complains about missing calloc - NULL checks in p11_util.c
Backport-of: 1cde536b98f2ebde0c18c65dcbf26254ed402776
1 parent eead543 commit e325957

File tree

1 file changed

+8
-0
lines changed
  • src/jdk.crypto.cryptoki/share/native/libj2pkcs11

1 file changed

+8
-0
lines changed

src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,10 @@ CK_MECHANISM_PTR updateGCMParams(JNIEnv *env, CK_MECHANISM_PTR mechPtr) {
481481
// CK_GCM_PARAMS => CK_GCM_PARAMS_NO_IVBITS
482482
pParams = (CK_GCM_PARAMS*) mechPtr->pParameter;
483483
pParamsNoIvBits = calloc(1, sizeof(CK_GCM_PARAMS_NO_IVBITS));
484+
if (pParamsNoIvBits == NULL) {
485+
p11ThrowOutOfMemoryError(env, 0);
486+
return NULL;
487+
}
484488
pParamsNoIvBits->pIv = pParams->pIv;
485489
pParamsNoIvBits->ulIvLen = pParams->ulIvLen;
486490
pParamsNoIvBits->pAAD = pParams->pAAD;
@@ -495,6 +499,10 @@ CK_MECHANISM_PTR updateGCMParams(JNIEnv *env, CK_MECHANISM_PTR mechPtr) {
495499
// CK_GCM_PARAMS_NO_IVBITS => CK_GCM_PARAMS
496500
pParamsNoIvBits = (CK_GCM_PARAMS_NO_IVBITS*) mechPtr->pParameter;
497501
pParams = calloc(1, sizeof(CK_GCM_PARAMS));
502+
if (pParams == NULL) {
503+
p11ThrowOutOfMemoryError(env, 0);
504+
return NULL;
505+
}
498506
pParams->pIv = pParamsNoIvBits->pIv;
499507
pParams->ulIvLen = pParamsNoIvBits->ulIvLen;
500508
pParams->ulIvBits = pParamsNoIvBits->ulIvLen << 3;

0 commit comments

Comments
 (0)