Changeset 498:5c4840391e7b in verona

Timestamp:

Jun 6, 2012 3:40:39 PM (12 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

avoid memory leaks in java director calls

Files:

• phcpp/phapipp.h (modified) (2 diffs)
• swig/verona.i (modified) (3 diffs)

phcpp/phapipp.h

@@ -75 +75 @@
         virtual ~phapi();
 
+#ifdef SWIG
+#define virtual
+#endif
+
         virtual int init(bool asyncMode = true);
         virtual void terminate();
@@ -206 +210 @@
 
 protected:
+#ifdef SWIG
+#undef virtual
+#endif
 
         //  user overridable callbacks

swig/verona.i

@@ -142 +142 @@
 
 %typemap(directorin,descriptor="Ljava/lang/String;") std::string 
-%{ $input = make_jstr(jenv, &$1); %}
+%{
+   // dirin std::string
+   $input = make_jstr(jenv, &$1); 
+   TmpJOBJ tmp$1_name(jenv, (jobject) $input);
+%}
 
 %typemap(out) std::string 
@@ -148 +152 @@
 
 %typemap(directorin,descriptor="Ljava/lang/String;") const std::string &
-%{ $input = make_jstr(jenv, &$1); %}
+%{ 
+   // dirin cost std::string&
+   $input = make_jstr(jenv, &$1); 
+   TmpJOBJ tmp$1_name(jenv, (jobject) $input);
+%}
+
+%typemap(directorin,descriptor="Ljava/lang/String;") const char*, char* 
+%{
+   // dirin char*
+  $input = 0;
+  if ($1) {
+    $input = jenv->NewStringUTF((const char *)$1);
+    if (!$input) return $null;
+  }
+  
+  TmpJOBJ tmp$1_name(jenv, (jobject) $input);
+%}
+
 
 %typemap(out) const std::string & 
@@ -163 +184 @@
 #else
 %include "std_map.i"
+#ifndef SWIGJAVA
 %include "std_string.i"
+#endif
 %include "std_vector.i"
 %include "std_pair.i"