jdk-sandbox: comparison jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c

equal deleted inserted replaced

-:fc08f20ea32f
+:56b3ab8ec81c
 #include "sun_security_jgss_wrapper_GSSLibStub.h"
 #include "NativeUtil.h"
 #include "NativeFunc.h"
 #include "jlong.h"
 #include <jni.h>
+#include "jni_util.h"
 /* Throws a Java Exception by name */
 void throwByName(JNIEnv *env, const char *name, const char *msg) {
 jclass cls = (*env)->FindClass(env, name);
 if (cls != 0) /* Otherwise an exception has already been thrown */
 (*env)->ThrowNew(env, cls, msg);
+JNU_Equals(env, NULL, NULL);
 }
 void throwOutOfMemoryError(JNIEnv *env, const char *message) {
 throwByName(env, "java/lang/OutOfMemoryError", message);
 }
 debug(env, "[GSSLibStub_init] GSS lib name is NULL");
 return JNI_FALSE;
 }
 libName = (*env)->GetStringUTFChars(env, jlibName, NULL);
+if (libName == NULL) {
+if (!(*env)->ExceptionCheck(env)) {
+throwOutOfMemoryError(env, NULL);
+}
+return JNI_FALSE;
+}
 sprintf(debugBuf, "[GSSLibStub_init] libName=%s", libName);
 debug(env, debugBuf);
 /* initialize global function table */
 error = loadNative(libName);
 found = JNI_TRUE;
 break;
 }
 }
 (*env)->ReleaseByteArrayElements(env, jbytes, bytes, 0);
+} else {
+JNU_CHECK_EXCEPTION_RETURN(env, jlong_zero);
 }
 if (found != JNI_TRUE) {
 checkStatus(env, NULL, GSS_S_BAD_MECH, 0, "[GSSLibStub_getMechPtr]");
 return ptr_to_jlong(NULL);
 } else return ptr_to_jlong(cOid);
 MID_ChannelBinding_getInitiatorAddr);
 if (jinetAddr != NULL) {
 cb->initiator_addrtype = GSS_C_AF_INET;
 value = (*env)->CallObjectMethod(env, jinetAddr,
 MID_InetAddress_getAddr);
-initGSSBuffer(env, value, &(cb->initiator_address));
+if (!initGSSBuffer(env, value, &(cb->initiator_address))) {
+return NULL;
+}
 } else {
 cb->initiator_addrtype = GSS_C_AF_NULLADDR;
 cb->initiator_address.length = 0;
 cb->initiator_address.value = NULL;
 }
 MID_ChannelBinding_getAcceptorAddr);
 if (jinetAddr != NULL) {
 cb->acceptor_addrtype = GSS_C_AF_INET;
 value = (*env)->CallObjectMethod(env, jinetAddr,
 MID_InetAddress_getAddr);
-initGSSBuffer(env, value, &(cb->acceptor_address));
+if (!initGSSBuffer(env, value, &(cb->acceptor_address))) {
+return NULL;
+}
 } else {
 cb->acceptor_addrtype = GSS_C_AF_NULLADDR;
 cb->acceptor_address.length = 0;
 cb->acceptor_address.value = NULL;
 }
 /* set up application data */
 value = (*env)->CallObjectMethod(env, jcb,
 MID_ChannelBinding_getAppData);
 if (value != NULL) {
-initGSSBuffer(env, value, &(cb->application_data));
+if (!initGSSBuffer(env, value, &(cb->application_data))) {
+return NULL;
+}
 } else {
 cb->application_data.length = 0;
 cb->application_data.value = NULL;
 }
 return cb;
 isDuplicate = ((suppInfo & GSS_S_DUPLICATE_TOKEN) != 0);
 isOld = ((suppInfo & GSS_S_OLD_TOKEN) != 0);
 isUnseq = ((suppInfo & GSS_S_UNSEQ_TOKEN) != 0);
 hasGap = ((suppInfo & GSS_S_GAP_TOKEN) != 0);
 minorMsg = getMinorMessage(env, jstub, minor);
+CHECK_NULL(minorMsg);
 (*env)->CallVoidMethod(env, jprop, MID_MessageProp_setSupplementaryStates,
 isDuplicate, isOld, isUnseq, hasGap, minor,
 minorMsg);
 }
 }
 result = getJavaOIDArray(env, nameTypes);
 /* release intermediate buffers */
 deleteGSSOIDSet(nameTypes);
+CHECK_NULL_RETURN(result, NULL);
 checkStatus(env, jobj, major, minor, "[GSSLibStub_inquireNamesForMech]");
 return result;
 } else return NULL;
 }
 gss_name_t nameHdl;
 nameHdl = GSS_C_NO_NAME;
 debug(env, "[GSSLibStub_importName]");
-initGSSBuffer(env, jnameVal, &nameVal);
+if (!initGSSBuffer(env, jnameVal, &nameVal)) {
+return jlong_zero;
+}
 nameType = newGSSOID(env, jnameType);
 if ((*env)->ExceptionCheck(env)) {
 deleteGSSOID(nameType);
 resetGSSBuffer(env, jnameVal, &nameVal);
 return jlong_zero;
 /* gss_display_name(...) => GSS_S_BAD_NAME */
 major = (*ftab->displayName)(&minor, nameHdl, &outNameBuf, &outNameType);
 /* release intermediate buffers */
 jname = getJavaString(env, &outNameBuf);
+if (jname == NULL && !(*env)->ExceptionCheck(env)) {
+throwOutOfMemoryError(env, NULL);
+return NULL;
+}
 jtype = getJavaOID(env, outNameType);
 jresult = (*env)->NewObjectArray(env, 2, CLS_Object, NULL);
+CHECK_NULL_RETURN(jresult, NULL);
 /* return immediately if an exception has occurred */
 if ((*env)->ExceptionCheck(env)) {
 return NULL;
 }
 gss_OID mech, mech2;
 debug(env, "[GSSLibStub_importContext]");
 contextHdl = GSS_C_NO_CONTEXT;
-initGSSBuffer(env, jctxtToken, &ctxtToken);
+if (!initGSSBuffer(env, jctxtToken, &ctxtToken)) {
+return NULL;
+}
 /* gss_import_sec_context(...) => GSS_S_NO_CONTEXT, GSS_S_DEFECTIVE_TOKEN,
 GSS_S_UNAVAILABLE, GSS_S_UNAUTHORIZED */
 major = (*ftab->importSecContext)(&minor, &ctxtToken, &contextHdl);
 if ((*env)->ExceptionCheck(env)) {
 free(cb);
 return NULL;
 }
-initGSSBuffer(env, jinToken, &inToken);
+if (!initGSSBuffer(env, jinToken, &inToken)) {
+return NULL;
+}
 sprintf(debugBuf,
 "[GSSLibStub_initContext] before: pCred=%ld, pContext=%ld",
 (long)credHdl, (long)contextHdl);
 debug(env, debugBuf);
 debug(env, "[GSSLibStub_acceptContext]");
 contextHdl = (gss_ctx_id_t)jlong_to_ptr(
 (*env)->GetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext));
 credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
-initGSSBuffer(env, jinToken, &inToken);
+if (!initGSSBuffer(env, jinToken, &inToken)) {
+return NULL;
+}
 cb = getGSSCB(env, jcb);
 if ((*env)->ExceptionCheck(env)) {
 free(cb);
 resetGSSBuffer(env, jinToken, &inToken);
 return NULL;
 result[3] = (jlong) isEstablished;
 result[4] = (jlong) flags;
 result[5] = (jlong) getJavaTime(time);
 jresult = (*env)->NewLongArray(env, 6);
+CHECK_NULL_RETURN(jresult, NULL);
 (*env)->SetLongArrayRegion(env, jresult, 0, 6, result);
 /* release intermediate buffers */
 checkStatus(env, jobj, major, minor, "[GSSLibStub_inquireContext]");
 checkStatus(env, jobj, GSS_S_CONTEXT_EXPIRED, 0, "[GSSLibStub_getMic]");
 return NULL;
 }
 contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 qop = (gss_qop_t) jqop;
-initGSSBuffer(env, jmsg, &msg);
+if (!initGSSBuffer(env, jmsg, &msg)) {
+return NULL;
+}
 /* gss_get_mic(...) => GSS_S_CONTEXT_EXPIRED, GSS_S_NO_CONTEXT(!),
 GSS_S_BAD_QOP */
 major =
 (*ftab->getMic)(&minor, contextHdl, qop, &msg, &msgToken);
 // Twik per javadoc
 checkStatus(env, jobj, GSS_S_CONTEXT_EXPIRED, 0,
 "[GSSLibStub_verifyMic]");
 return;
 }
-initGSSBuffer(env, jmsg, &msg);
-initGSSBuffer(env, jmsgToken, &msgToken);
+if (!initGSSBuffer(env, jmsg, &msg) ||
+!initGSSBuffer(env, jmsgToken, &msgToken)) {
+return;
+}
 qop = (gss_qop_t) (*env)->CallIntMethod(env, jprop, MID_MessageProp_getQOP);
 /* gss_verify_mic(...) => GSS_S_DEFECTIVE_TOKEN, GSS_S_BAD_MIC,
 GSS_S_CONTEXT_EXPIRED, GSS_S_DUPLICATE_TOKEN(!), GSS_S_OLD_TOKEN(!),
 GSS_S_UNSEQ_TOKEN(!), GSS_S_GAP_TOKEN(!), GSS_S_NO_CONTEXT(!) */
 major =
 confFlag =
 (*env)->CallBooleanMethod(env, jprop, MID_MessageProp_getPrivacy);
 qop = (gss_qop_t)
 (*env)->CallIntMethod(env, jprop, MID_MessageProp_getQOP);
-initGSSBuffer(env, jmsg, &msg);
+if (!initGSSBuffer(env, jmsg, &msg)) {
+return NULL;
+}
 /* gss_wrap(...) => GSS_S_CONTEXT_EXPIRED, GSS_S_NO_CONTEXT(!),
 GSS_S_BAD_QOP */
 major = (*ftab->wrap)(&minor, contextHdl, confFlag, qop, &msg, &confState,
 &msgToken);
 if (contextHdl == GSS_C_NO_CONTEXT) {
 // Twik per javadoc
 checkStatus(env, jobj, GSS_S_CONTEXT_EXPIRED, 0, "[GSSLibStub_unwrap]");
 return NULL;
 }
-initGSSBuffer(env, jmsgToken, &msgToken);
+if (!initGSSBuffer(env, jmsgToken, &msgToken)) {
+return NULL;
+}
 confState = 0;
 qop = GSS_C_QOP_DEFAULT;
 /* gss_unwrap(...) => GSS_S_DEFECTIVE_TOKEN, GSS_S_BAD_MIC,
 GSS_S_CONTEXT_EXPIRED, GSS_S_DUPLICATE_TOKEN(!), GSS_S_OLD_TOKEN(!),
 GSS_S_UNSEQ_TOKEN(!), GSS_S_GAP_TOKEN(!), GSS_S_NO_CONTEXT(!) */

changeset 22940	56b3ab8ec81c
parent 18175	4ed91d93ab81
child 22942	3e0d28137ea8