From aca12d2ebf783d7b3c17a82c865b199e31998d4c Mon Sep 17 00:00:00 2001 From: "sdv%sparc.spb.su" Date: Wed, 16 Feb 2000 00:45:37 +0000 Subject: [PATCH] addon fix to bug 13338 git-svn-id: svn://10.0.0.236/trunk@60981 18797224-902f-48f8-a5cc-f745e15eee43 --- .../jni/org_mozilla_dom_DOMImplementationImpl.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp index a09fb21d670..71b44a54ad3 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_DOMImplementationImpl.cpp @@ -142,7 +142,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_hasFeature { nsIDOMDOMImplementation* dom = (nsIDOMDOMImplementation*) env->GetLongField(jthis, JavaDOMGlobals::domImplementationPtrFID); - if (!dom || !jversion || !jfeature) { + if (!dom || !jfeature) { PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, ("DOMImplementation.hasFeature: NULL pointer\n")); return JNI_FALSE; @@ -157,11 +157,14 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_dom_DOMImplementationImpl_hasFeature } jboolean iscopy2 = JNI_FALSE; - const char* version = env->GetStringUTFChars(jversion, &iscopy2); - if (!version) { - PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, - ("DOMImplementation.hasFeature: GetStringUTFChars version failed\n")); - return JNI_FALSE; + const char* version = NULL; + if (jversion) { + version = env->GetStringUTFChars(jversion, &iscopy2); + if (!version) { + PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, + ("DOMImplementation.hasFeature: GetStringUTFChars version failed\n")); + return JNI_FALSE; + } } PRBool ret = PR_FALSE;