From a0e21e82ca112624ed2ab588424dec022e1e6a5a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 28 Apr 2012 14:29:23 +0000
Subject: [PATCH] char **STRING_ARRAY typemaps fixed to handle null pointers

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13021 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               |  4 ++
 .../java/java_lib_various_runme.java          |  5 ++
 Lib/java/various.i                            | 48 +++++++++++--------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index a2ebf35f9..f3cb1de21 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -11,3 +11,7 @@ Version 2.0.6 (in progress)
 2012-04-28: wsfulton
             [Python] Fix compilation errors when wrapping STL containers on Mac OSX 64 bit.
 
+2012-04-28: wsfulton
+            [Java] Patch 3521811 from Leo Davis - char **STRING_ARRAY typemaps fixed to handle
+            null pointers.
+
diff --git a/Examples/test-suite/java/java_lib_various_runme.java b/Examples/test-suite/java/java_lib_various_runme.java
index ab54aced8..203a30ec2 100644
--- a/Examples/test-suite/java/java_lib_various_runme.java
+++ b/Examples/test-suite/java/java_lib_various_runme.java
@@ -45,6 +45,11 @@ public class java_lib_various_runme {
       if ( !langs[i].equals(newLangs[i]) )
         throw new RuntimeException("Languages verify failed " + i + " " + langs[i] + "|" + newLangs[i]);
 
+    // STRING_ARRAY null
+    java_lib_various.setLanguages(null);
+    if (java_lib_various.getLanguages() != null)
+      throw new RuntimeException("languages should be null");
+
     // STRING_RET test
     {
       String stringOutArray[] = { "" };
diff --git a/Lib/java/various.i b/Lib/java/various.i
index 9e7cf29ca..71569ca32 100644
--- a/Lib/java/various.i
+++ b/Lib/java/various.i
@@ -23,7 +23,8 @@
 %typemap(jtype) char **STRING_ARRAY "String[]"
 %typemap(jstype) char **STRING_ARRAY "String[]"
 %typemap(in) char **STRING_ARRAY (jint size) {
-    int i = 0;
+  int i = 0;
+  if ($input) {
     size = JCALL1(GetArrayLength, jenv, $input);
 #ifdef __cplusplus
     $1 = new char*[size+1];
@@ -31,51 +32,56 @@
     $1 = (char **)calloc(size+1, sizeof(char *));
 #endif
     for (i = 0; i<size; i++) {
-        jstring j_string = (jstring)JCALL2(GetObjectArrayElement, jenv, $input, i);
-        const char *c_string = JCALL2(GetStringUTFChars, jenv, j_string, 0);
+      jstring j_string = (jstring)JCALL2(GetObjectArrayElement, jenv, $input, i);
+      const char *c_string = JCALL2(GetStringUTFChars, jenv, j_string, 0);
 #ifdef __cplusplus
-        $1[i] = new char [strlen(c_string)+1];
+      $1[i] = new char [strlen(c_string)+1];
 #else
-        $1[i] = (char *)calloc(strlen(c_string)+1, sizeof(const char *));
+      $1[i] = (char *)calloc(strlen(c_string)+1, sizeof(const char *));
 #endif
-        strcpy($1[i], c_string);
-        JCALL2(ReleaseStringUTFChars, jenv, j_string, c_string);
-        JCALL1(DeleteLocalRef, jenv, j_string);
+      strcpy($1[i], c_string);
+      JCALL2(ReleaseStringUTFChars, jenv, j_string, c_string);
+      JCALL1(DeleteLocalRef, jenv, j_string);
     }
     $1[i] = 0;
+  } else {
+    $1 = 0;
+  }
 }
 
 %typemap(freearg) char **STRING_ARRAY {
-    int i;
-    for (i=0; i<size$argnum-1; i++)
+  int i;
+  for (i=0; i<size$argnum-1; i++)
 #ifdef __cplusplus
-      delete[] $1[i];
-    delete[] $1;
+    delete[] $1[i];
+  delete[] $1;
 #else
-      free($1[i]);
-    free($1);
+  free($1[i]);
+  free($1);
 #endif
 }
 
 %typemap(out) char **STRING_ARRAY {
+  if ($1) {
     int i;
     int len=0;
     jstring temp_string;
     const jclass clazz = JCALL1(FindClass, jenv, "java/lang/String");
 
-    while ($1[len]) len++;    
-    jresult = JCALL3(NewObjectArray, jenv, len, clazz, NULL);
+    while ($1[len]) len++;
+    $result = JCALL3(NewObjectArray, jenv, len, clazz, NULL);
     /* exception checking omitted */
 
     for (i=0; i<len; i++) {
       temp_string = JCALL1(NewStringUTF, jenv, *$1++);
-      JCALL3(SetObjectArrayElement, jenv, jresult, i, temp_string);
+      JCALL3(SetObjectArrayElement, jenv, $result, i, temp_string);
       JCALL1(DeleteLocalRef, jenv, temp_string);
     }
+  }
 }
 
 %typemap(javain) char **STRING_ARRAY "$javainput"
-%typemap(javaout) char **STRING_ARRAY  {
+%typemap(javaout) char **STRING_ARRAY {
     return $jnicall;
   }
 
@@ -111,7 +117,7 @@
 
 %typemap(argout) char **STRING_OUT {
   jstring jnewstring = NULL;
-  if($1) {
+  if ($1) {
      jnewstring = JCALL1(NewStringUTF, jenv, *$1);
   }
   JCALL3(SetObjectArrayElement, jenv, $input, 0, jnewstring); 
@@ -134,11 +140,11 @@
 %typemap(jtype) char *BYTE "byte[]"
 %typemap(jstype) char *BYTE "byte[]"
 %typemap(in) char *BYTE {
-    $1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0); 
+  $1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0); 
 }
 
 %typemap(argout) char *BYTE {
-    JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0); 
+  JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0); 
 }
 
 %typemap(javain) char *BYTE "$javainput"