Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checking For Null to prevent NPE when converting Variants #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Checking For Null to prevent NPE when converting Variants #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions native/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ JNIEXPORT void JNICALL Java_com4j_Variant_changeType0(JNIEnv* env, jclass, jint
JNIEXPORT jobject JNICALL Java_com4j_Variant_convertTo(JNIEnv* env, jobject instance, jclass target) {
try {
VARIANT* v = com4jVariantToVARIANT(env,instance);
while(v->vt & VT_BYREF) // unpeel VT_BYREF to get to the nested VARIANT
while(v != NULL && v->vt & VT_BYREF) // unpeel VT_BYREF to get to the nested VARIANT
v = reinterpret_cast<VARIANT*>(v->byref);
if(v == NULL)
return NULL;
jobject r = variantToObject(env,target,*v);
if(r==reinterpret_cast<jobject>(-1)) {
jstring name = javaLangClass_getName(env,target);
Expand Down Expand Up @@ -295,7 +297,7 @@ jobject variantToObject( JNIEnv* env, jclass retType, VARIANT& v ) {
}

// consider a conversion from SAFEARRAY
if((v.vt&VT_ARRAY)!=0) {
if((v.vt&VT_ARRAY)!=0 && v.parray != NULL) {
return safearray::SafeArrayXducer::toJava(env,v.parray);
}

Expand Down