From c171aa015a0cbeab69fa359835f7c82f269d6111 Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Mon, 15 Nov 2010 14:20:19 -0500
Subject: [PATCH] Fix a crash due to null java strings.

Change-Id: I29a229da168181ba3d5bc5fb84365f275eb42869
---
 WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp b/WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp
index ab00ba639..112660948 100644
--- a/WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp
+++ b/WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp
@@ -101,10 +101,16 @@ UrlInterceptResponse::UrlInterceptResponse(JNIEnv* env, jobject response) {
     jstring mimeStr = (jstring) env->GetObjectField(response, mimeType);
     jstring encodingStr = (jstring) env->GetObjectField(response, encoding);
 
-    m_mimeType.assign(env->GetStringUTFChars(mimeStr, NULL),
-                      env->GetStringUTFLength(mimeStr));
-    m_encoding.assign(env->GetStringUTFChars(encodingStr, NULL),
-                      env->GetStringUTFLength(encodingStr));
+    if (mimeStr) {
+        m_mimeType.assign(env->GetStringUTFChars(mimeStr, NULL),
+                          env->GetStringUTFLength(mimeStr));
+        env->ReleaseStringUTFChars(mimeStr, NULL);
+    }
+    if (encodingStr) {
+        m_encoding.assign(env->GetStringUTFChars(encodingStr, NULL),
+                          env->GetStringUTFLength(encodingStr));
+        env->ReleaseStringUTFChars(encodingStr, NULL);
+    }
 
     env->DeleteLocalRef(javaResponse);
     env->DeleteLocalRef(mimeStr);
-- 
2.11.0