Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UTF8 conversion in Java. (#70)

Browse Source 
Java doesn't use standard UTF8, so surrogate pairs were being converted
incorrectly and incompatibly with C++.

Fixes #69 (artf3973).
This commit is contained in:
Peter Johnson
2016-06-10 22:24:42 -04:00
committed by GitHub
parent 6272244a73
commit 3c77faaf61
4 changed files with 1103 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
java/lib/NetworkTablesJNI.cpp
View File

@@ -11,6 +11,9 @@
#include "ntcore.h"
#include "atomic_static.h"
#include "SafeThread.h"
#include "llvm/ConvertUTF.h"
#include "llvm/SmallString.h"
#include "llvm/SmallVector.h"
//
// Globals and load/unload
@@ -221,20 +224,19 @@ class JavaWeakGlobal {
class JavaStringRef {
public:
JavaStringRef(JNIEnv *env, jstring str)
: m_env(env),
m_jstr(str),
m_str(env->GetStringUTFChars(str, nullptr)) {}
~JavaStringRef() { m_env->ReleaseStringUTFChars(m_jstr, m_str); }
JavaStringRef(JNIEnv *env, jstring str) {
jsize size = env->GetStringLength(str);
const jchar *chars = env->GetStringChars(str, nullptr);
llvm::convertUTF16ToUTF8String(llvm::makeArrayRef(chars, size), m_str);
env->ReleaseStringChars(str, chars);
}
operator nt::StringRef() const { return nt::StringRef(m_str); }
nt::StringRef str() const { return nt::StringRef(m_str); }
const char *c_str() const { return m_str; }
operator nt::StringRef() const { return m_str; }
nt::StringRef str() const { return m_str; }
const char* c_str() const { return m_str.data(); }
private:
JNIEnv *m_env;
jstring m_jstr;
const char *m_str;
llvm::SmallString<128> m_str;
};
class JavaByteRef {
@@ -344,11 +346,9 @@ std::shared_ptr<nt::Value> FromJavaStringArray(JNIEnv *env, jobjectArray jarr) {
//
static inline jstring ToJavaString(JNIEnv *env, nt::StringRef str) {
// fastpath if string already null terminated; if not, need to make a copy
if (str.data()[str.size()] == '\0')
return env->NewStringUTF(str.data());
else
return env->NewStringUTF(str.str().c_str());
llvm::SmallVector<UTF16, 128> chars;
llvm::convertUTF8ToUTF16String(str, chars);
return env->NewString(chars.begin(), chars.size());
}
static jbyteArray ToJavaByteArray(JNIEnv *env, nt::StringRef str) {