rik/jlibcom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1224219 fixed incorrect memory release

Browse Source
This commit is contained in:
clay_shooter
2006-02-20 14:04:46 +00:00
parent b97ebfb526
commit 36c5cd4fb7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jni/SafeArray.cpp
View File

@@ -558,7 +558,9 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_fromStringArray
V_VT(&v) = VT_BSTR; V_VT(&v) = VT_BSTR;
for(int i=0;i<len;i++) { for(int i=0;i<len;i++) {
jstring s = (jstring)env->GetObjectArrayElement(a, i); jstring s = (jstring)env->GetObjectArrayElement(a, i);
// jacob report 1224219 should use unicode and not UTF-8 (Variant modified in previous report // jacob report 1224219 should use unicode and not UTF-8
// GetStringUTFChars() replaced with GetStringChars()
// (Variant modified in previous report)
const jchar *str = env->GetStringChars(s, NULL); const jchar *str = env->GetStringChars(s, NULL);
CComBSTR bs(str); CComBSTR bs(str);
V_VT(&v) = VT_BSTR; V_VT(&v) = VT_BSTR;
@@ -571,7 +573,9 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_fromStringArray
} else if (vt == VT_BSTR) { } else if (vt == VT_BSTR) {
for(int i=0;i<len;i++) { for(int i=0;i<len;i++) {
jstring s = (jstring)env->GetObjectArrayElement(a, i); jstring s = (jstring)env->GetObjectArrayElement(a, i);
// jacob report 1224219 should use unicode and not UTF-8 (Variant modified in previous report // jacob report 1224219 should use unicode and not UTF-8
// GetStringUTFChars() replaced with GetStringChars()
// (Variant modified in previous report)
const jchar *str = env->GetStringChars(s, NULL); const jchar *str = env->GetStringChars(s, NULL);
CComBSTR bs(str); CComBSTR bs(str);
BSTR bstr = bs.Detach(); BSTR bstr = bs.Detach();
@@ -1625,7 +1629,7 @@ JNIEXPORT jstring JNICALL Java_com_jacob_com_SafeArray_getString__I
jstring js = env->NewString(bs, SysStringLen(bs)); jstring js = env->NewString(bs, SysStringLen(bs));
// jacob report 1224219 // jacob report 1224219
// SafeArrayGetElement memory must be freed http://www.canaimasoft.com/f90VB/OnlineManuals/Reference/TH_31.htm // SafeArrayGetElement memory must be freed http://www.canaimasoft.com/f90VB/OnlineManuals/Reference/TH_31.htm
if (bs) free(bs); if (bs) SysFreeString(bs);
return js; return js;
} }
ThrowComFail(env, "safearray cannot get string", 0); ThrowComFail(env, "safearray cannot get string", 0);