jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent memory leaks in the case of early return from wrapper methods using const std::string & parameters.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6085 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-08-12 20:57:51 +00:00
commit d86b421950
1 changed files with 61 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

131
Lib/java/std_string.i
View file

@ -32,16 +32,14 @@ class string;
%typemap(javadirectorout) string "$javacall" %typemap(javadirectorout) string "$javacall"
%typemap(in) string %typemap(in) string
%{if($input) { %{if(!$input) {
const char *pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!pstr) return $null;
$1 = std::string(pstr);
jenv->ReleaseStringUTFChars($input, pstr);
}
else {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
return $null; return $null;
} %} }
const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!$1_pstr) return $null;
$1 = std::string($1_pstr);
jenv->ReleaseStringUTFChars($input, $1_pstr); %}
%typemap(directorin,descriptor="Ljava/lang/String;") string %typemap(directorin,descriptor="Ljava/lang/String;") string
%{ $input = jenv->NewStringUTF($1.c_str()); %} %{ $input = jenv->NewStringUTF($1.c_str()); %}
@ -69,21 +67,16 @@ class string;
%typemap(javadirectorin) const string & "$jniinput" %typemap(javadirectorin) const string & "$jniinput"
%typemap(javadirectorout) const string & "$javacall" %typemap(javadirectorout) const string & "$javacall"
%typemap(in) const string & %typemap(in) const string &
%{$1 = NULL; %{if(!$input) {
if($input) {
const char *pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!pstr) return $null;
$1 = new std::string(pstr);
jenv->ReleaseStringUTFChars($input, pstr);
}
else {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
return $null; return $null;
} %} }
const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0);
%typemap(freearg) const string & if (!$1_pstr) return $null;
%{ delete $1; %} std::string $1_str($1_pstr);
$1 = &$1_str;
jenv->ReleaseStringUTFChars($input, $1_pstr); %}
%typemap(directorin,descriptor="Ljava/lang/String;") const string & %typemap(directorin,descriptor="Ljava/lang/String;") const string &
%{ $input = jenv->NewStringUTF($1.c_str()); %} %{ $input = jenv->NewStringUTF($1.c_str()); %}
@ -133,41 +126,40 @@ class wstring;
%typemap(javadirectorout) wstring "$javacall" %typemap(javadirectorout) wstring "$javacall"
%typemap(in) wstring %typemap(in) wstring
%{if($input) { %{if(!$input) {
const jchar *pstr = jenv->GetStringChars($input, 0);
if (!pstr) return $null;
jsize len = jenv->GetStringLength($input);
if (len) {
wchar_t *conv_buf = new wchar_t[len];
for (jsize i = 0; i < len; ++i) {
conv_buf[i] = pstr[i];
}
$1 = std::wstring(conv_buf, len);
delete [] conv_buf;
}
jenv->ReleaseStringChars($input, pstr);
}
else {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
return $null; return $null;
} %} }
const jchar *$1_pstr = jenv->GetStringChars($input, 0);
if (!$1_pstr) return $null;
jsize $1_len = jenv->GetStringLength($input);
if ($1_len) {
wchar_t *conv_buf = new wchar_t[$1_len];
for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = $1_pstr[i];
}
$1 = std::wstring(conv_buf, $1_len);
delete [] conv_buf;
}
jenv->ReleaseStringChars($input, $1_pstr);
%}
%typemap(directorin,descriptor="Ljava/lang/String;") wstring %typemap(directorin,descriptor="Ljava/lang/String;") wstring
%{jsize len = $1.length(); %{jsize $1_len = $1.length();
jchar *conv_buf = new jchar[len]; jchar *conv_buf = new jchar[$1_len];
for (jsize i = 0; i < len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = (jchar)$1[i]; conv_buf[i] = (jchar)$1[i];
} }
$input = jenv->NewString(conv_buf, len); $input = jenv->NewString(conv_buf, $1_len);
delete [] conv_buf; %} delete [] conv_buf; %}
%typemap(out) wstring %typemap(out) wstring
%{jsize len = $1.length(); %{jsize $1_len = $1.length();
jchar *conv_buf = new jchar[len]; jchar *conv_buf = new jchar[$1_len];
for (jsize i = 0; i < len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = (jchar)$1[i]; conv_buf[i] = (jchar)$1[i];
} }
$result = jenv->NewString(conv_buf, len); $result = jenv->NewString(conv_buf, $1_len);
delete [] conv_buf; %} delete [] conv_buf; %}
%typemap(javain) wstring "$javainput" %typemap(javain) wstring "$javainput"
@ -184,42 +176,41 @@ class wstring;
%typemap(javadirectorout) const wstring & "$javacall" %typemap(javadirectorout) const wstring & "$javacall"
%typemap(in) const wstring & %typemap(in) const wstring &
%{$1 = NULL; %{if(!$input) {
if($input) {
const jchar *pstr = jenv->GetStringChars($input, 0);
if (!pstr) return $null;
jsize len = jenv->GetStringLength($input);
if (len) {
wchar_t *conv_buf = new wchar_t[len];
for (jsize i = 0; i < len; ++i) {
conv_buf[i] = pstr[i];
}
$1 = new std::wstring(conv_buf, len);
delete [] conv_buf;
}
jenv->ReleaseStringChars($input, pstr);
}
else {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
return $null; return $null;
} %} }
const jchar *$1_pstr = jenv->GetStringChars($input, 0);
if (!$1_pstr) return $null;
jsize $1_len = jenv->GetStringLength($input);
std::wstring $1_str;
if ($1_len) {
wchar_t *conv_buf = new wchar_t[$1_len];
for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = $1_pstr[i];
}
$1_str = std::wstring(conv_buf, $1_len);
delete [] conv_buf;
}
$1 = &$1_str;
jenv->ReleaseStringChars($input, $1_pstr); %}
%typemap(directorin,descriptor="Ljava/lang/String;") const wstring & %typemap(directorin,descriptor="Ljava/lang/String;") const wstring &
%{jsize len = $1->length(); %{jsize $1_len = $1->length();
jchar *conv_buf = new jchar[len]; jchar *conv_buf = new jchar[$1_len];
for (jsize i = 0; i < len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = (jchar)(*$1)[i]; conv_buf[i] = (jchar)(*$1)[i];
} }
$input = jenv->NewString(conv_buf, len); $input = jenv->NewString(conv_buf, $1_len);
delete [] conv_buf; %} delete [] conv_buf; %}
%typemap(out) const wstring & %typemap(out) const wstring &
%{jsize len = $1->length(); %{jsize $1_len = $1->length();
jchar *conv_buf = new jchar[len]; jchar *conv_buf = new jchar[$1_len];
for (jsize i = 0; i < len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = (jchar)(*$1)[i]; conv_buf[i] = (jchar)(*$1)[i];
} }
$result = jenv->NewString(conv_buf, len); $result = jenv->NewString(conv_buf, $1_len);
delete [] conv_buf; %} delete [] conv_buf; %}
%typemap(javain) const wstring & "$javainput" %typemap(javain) const wstring & "$javainput"