Skip to content

Commit e86fe01

Browse files
authored
Merge pull request #348 from JeremiahM37/fenrir-fixes-2
Guard CertManager verify buffer null
2 parents 633b2cc + c7f2dfb commit e86fe01

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
@@ -162,9 +162,14 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerVerifyBuff
162162
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
163163
buffSz = (*jenv)->GetArrayLength(jenv, in);
164164

165-
ret = wolfSSL_CertManagerVerifyBuffer(cm, buff, buffSz, format);
166-
167-
(*jenv)->ReleaseByteArrayElements(jenv, in, (jbyte*)buff, JNI_ABORT);
165+
if (buff != NULL) {
166+
ret = wolfSSL_CertManagerVerifyBuffer(cm, buff, buffSz, format);
167+
(*jenv)->ReleaseByteArrayElements(jenv, in,
168+
(jbyte*)buff, JNI_ABORT);
169+
}
170+
else {
171+
ret = BAD_FUNC_ARG;
172+
}
168173

169174
return (jint)ret;
170175
}

0 commit comments

Comments
 (0)