yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 02:09:35 +02:00
Code Issues Releases Wiki Activity

fixed seg.fault

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-16 18:27:37 +00:00
parent 4d8d2fcb0e
commit ff57580c22
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -205,6 +205,9 @@ jobject AndroidUtil::createZLFile(JNIEnv *env, const std::string &path) {
} }
std::string AndroidUtil::fromJavaString(JNIEnv *env, jstring from) { std::string AndroidUtil::fromJavaString(JNIEnv *env, jstring from) {
if (from == 0) {
return std::string();
}
const char *data = env->GetStringUTFChars(from, 0); const char *data = env->GetStringUTFChars(from, 0);
const std::string result(data); const std::string result(data);
env->ReleaseStringUTFChars(from, data); env->ReleaseStringUTFChars(from, data);

2
jni/NativeFormats/zlibrary/core/src/encoding/DummyEncodingConverter.cpp
View file

@ -37,7 +37,7 @@ friend class DummyEncodingConverterProvider;
bool DummyEncodingConverterProvider::providesConverter(const std::string &encoding) { bool DummyEncodingConverterProvider::providesConverter(const std::string &encoding) {
const std::string lowerCasedEncoding = ZLUnicodeUtil::toLower(encoding); const std::string lowerCasedEncoding = ZLUnicodeUtil::toLower(encoding);
return (lowerCasedEncoding == "utf-8") || (lowerCasedEncoding == "us-ascii"); return lowerCasedEncoding == "utf-8" || lowerCasedEncoding == "us-ascii";
} }
shared_ptr<ZLEncodingConverter> DummyEncodingConverterProvider::createConverter() { shared_ptr<ZLEncodingConverter> DummyEncodingConverterProvider::createConverter() {