Skip to content

Commit 8d920ad

Browse files
committed
Guard CertManager buffer null use
1 parent 9f4169b commit 8d920ad

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

native/com_wolfssl_WolfSSLCertManager.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,14 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCABuff
119119
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
120120
buffSz = (*jenv)->GetArrayLength(jenv, in);
121121

122-
ret = wolfSSL_CertManagerLoadCABuffer(cm, buff, buffSz, format);
123-
124-
(*jenv)->ReleaseByteArrayElements(jenv, in, (jbyte*)buff, JNI_ABORT);
122+
if (buff != NULL) {
123+
ret = wolfSSL_CertManagerLoadCABuffer(cm, buff, buffSz, format);
124+
(*jenv)->ReleaseByteArrayElements(jenv, in,
125+
(jbyte*)buff, JNI_ABORT);
126+
}
127+
else {
128+
ret = BAD_FUNC_ARG;
129+
}
125130

126131
return (jint)ret;
127132
}

0 commit comments

Comments
 (0)