Skip to content

Commit 73ee45b

Browse files
SessionHero01SessionHero01
andauthored
Fixes a crash where getProProof is called on a wrong object (#42)
Co-authored-by: SessionHero01 <SesshioHero01@getsession.org>
1 parent b9061a4 commit 73ee45b

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

library/src/main/cpp/conversation.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ JavaLocalRef<jobject> serialize_one_to_one(JNIEnv *env, const session::config::c
5353
struct WithProProofInfoClassInfo : public JavaClassInfo {
5454
jmethodID proProofInfo_getter;
5555

56-
WithProProofInfoClassInfo(JNIEnv *env, jobject obj)
57-
: JavaClassInfo(env, obj)
56+
WithProProofInfoClassInfo(JNIEnv *env)
57+
: JavaClassInfo(env, "network/loki/messenger/libsession_util/util/WithProProofInfo")
5858
, proProofInfo_getter(env->GetMethodID(java_class, "getProProofInfo", "()Lnetwork/loki/messenger/libsession_util/util/Conversation$ProProofInfo;"))
5959
{}
6060

61-
static const WithProProofInfoClassInfo& get(JNIEnv *env, jobject obj) {
62-
static WithProProofInfoClassInfo instance(env, obj);
61+
static const WithProProofInfoClassInfo& get(JNIEnv *env) {
62+
static WithProProofInfoClassInfo instance(env);
6363
return instance;
6464
}
6565
};
@@ -133,7 +133,7 @@ session::config::convo::one_to_one deserialize_one_to_one(JNIEnv *env, jobject i
133133
r.unread = env->CallBooleanMethod(info, class_info.unread_getter);
134134

135135
JavaLocalRef<jobject> pro_proof(env, env->CallObjectMethod(
136-
info, WithProProofInfoClassInfo::get(env, info).proProofInfo_getter));
136+
info, WithProProofInfoClassInfo::get(env).proProofInfo_getter));
137137

138138
ProProofInfoClassInfo::read_gen_index_hash(r.pro_gen_index_hash, env, pro_proof.get());
139139
r.pro_expiry_unix_ts = ProProofInfoClassInfo::read_pro_expiry(env, pro_proof.get());
@@ -300,7 +300,7 @@ session::config::convo::blinded_one_to_one deserialize_blinded_one_to_one(JNIEnv
300300
r.unread = env->CallBooleanMethod(info, class_info.unread_getter);
301301

302302
JavaLocalRef<jobject> pro_proof(env, env->CallObjectMethod(
303-
info, WithProProofInfoClassInfo::get(env, info).proProofInfo_getter));
303+
info, WithProProofInfoClassInfo::get(env).proProofInfo_getter));
304304

305305
ProProofInfoClassInfo::read_gen_index_hash(r.pro_gen_index_hash, env, pro_proof.get());
306306
r.pro_expiry_unix_ts = ProProofInfoClassInfo::read_pro_expiry(env, pro_proof.get());

0 commit comments

Comments
 (0)