commit 9e0c711a6230af1db0753af401804c95e4bee69d
author Ken Wakasa <kwakasa@google.com> Thu Aug 09 22:26:58 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Thu Aug 09 22:28:57 2012 +0900
tree f4cd9db5df639ea875fe13465bfe9ad698eb7ecf
parent 805ac949d22946e60cbe311676e32d1f4f02ced3

Stop using STL string in additional_proximity_chars

Change-Id: Ic016fd5983b8855b0fd9506a17b205db86af3a2f

native/jni/src/proximity_info.cpp

diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 4f6507e..2564c8a 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -17,7 +17,6 @@
 #include <cassert>
 #include <cmath>
 #include <cstring>
-#include <string>
 
 #define LOG_TAG "LatinIME: proximity_info.cpp"
 
@@ -68,10 +67,12 @@
         AKLOGI("Create proximity info array %d", proximityGridLength);
     }
     const jsize localeCStrUtf8Length = env->GetStringUTFLength(localeJStr);
-    char localeCStr[localeCStrUtf8Length + 1];
-    env->GetStringUTFRegion(localeJStr, 0, env->GetStringLength(localeJStr), localeCStr);
-    localeCStr[localeCStrUtf8Length] = '\0';
-    mLocaleStr = new std::string(localeCStr);
+    if (localeCStrUtf8Length >= MAX_LOCALE_STRING_LENGTH) {
+        AKLOGI("Locale string length too long: length=%d", localeCStrUtf8Length);
+        assert(false);
+    }
+    memset(mLocaleStr, 0, sizeof(mLocaleStr));
+    env->GetStringUTFRegion(localeJStr, 0, env->GetStringLength(localeJStr), mLocaleStr);
     mProximityCharsArray = new int32_t[proximityGridLength];
     safeGetOrFillZeroIntArrayRegion(env, proximityChars, proximityGridLength, mProximityCharsArray);
     safeGetOrFillZeroIntArrayRegion(env, keyXCoordinates, KEY_COUNT, mKeyXCoordinates);
@@ -98,7 +99,6 @@
 }
 
 ProximityInfo::~ProximityInfo() {
-    delete mLocaleStr;
     delete[] mProximityCharsArray;
 }