From 9feab8fb3aece411bfb65d5d8ffbea61e68aca85 Mon Sep 17 00:00:00 2001
From: Lillian Angel <langel@openjdk.org>
Date: Thu, 25 Jun 2009 17:01:56 -0400
Subject: [PATCH] 6852607: MessageUtils JVM crash

Fixes crash by checking null field

Reviewed-by: alanb
---
 jdk/src/share/native/sun/misc/MessageUtils.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jdk/src/share/native/sun/misc/MessageUtils.c b/jdk/src/share/native/sun/misc/MessageUtils.c
index 4d24e6d03bd..e2fbd4da232 100644
--- a/jdk/src/share/native/sun/misc/MessageUtils.c
+++ b/jdk/src/share/native/sun/misc/MessageUtils.c
@@ -39,6 +39,11 @@ printToFile(JNIEnv *env, jstring s, FILE *file)
     int i;
     const jchar *sAsArray;
 
+    if (s == NULL) {
+      s = (*env)->NewStringUTF(env, "null");
+      if (s == NULL) return;
+    }
+
     sAsArray = (*env)->GetStringChars(env, s, NULL);
     length = (*env)->GetStringLength(env, s);
     sConverted = (char *) malloc(length + 1);