summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-08-31 16:55:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-31 16:55:08 -0700
commitb695741330f56405f559a0fb2df89a21dbbb3b1f (patch)
tree0d52f27c258a122fc8720e10b2a623f2f4199080
parent9100473a7e908c7292008140f76ca5009a4335d4 (diff)
parentf786b6ca5df079f5cc84838251137f9b65ae10c9 (diff)
downloadframeworks_base-b695741330f56405f559a0fb2df89a21dbbb3b1f.zip
frameworks_base-b695741330f56405f559a0fb2df89a21dbbb3b1f.tar.gz
frameworks_base-b695741330f56405f559a0fb2df89a21dbbb3b1f.tar.bz2
Merge "Fix JNI leak in copyStringToBuffer Bug: 5244396"
-rw-r--r--core/jni/android_database_CursorWindow.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp
index ddac820..419e464 100644
--- a/core/jni/android_database_CursorWindow.cpp
+++ b/core/jni/android_database_CursorWindow.cpp
@@ -352,7 +352,6 @@ LOG_WINDOW("Copying string for %d,%d from %p", row, column, window);
char buf[32];
int len;
snprintf(buf, sizeof(buf), "%lld", value);
- jchar* dst = env->GetCharArrayElements(buffer, NULL);
sizeCopied = charToJchar(buf, dst, bufferSize);
}
} else if (type == FIELD_TYPE_FLOAT) {
@@ -360,7 +359,6 @@ LOG_WINDOW("Copying string for %d,%d from %p", row, column, window);
if (window->getDouble(row, column, &value)) {
char tempbuf[32];
snprintf(tempbuf, sizeof(tempbuf), "%g", value);
- jchar* dst = env->GetCharArrayElements(buffer, NULL);
sizeCopied = charToJchar(tempbuf, dst, bufferSize);
}
} else if (type == FIELD_TYPE_NULL) {