Skip to content

Fixes a crash where getProProof is called on a wrong object #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SessionHero01 merged 1 commit into from
Mar 3, 2026
Merged

Fixes a crash where getProProof is called on a wrong object #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions library/src/main/cpp/conversation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ JavaLocalRef<jobject> serialize_one_to_one(JNIEnv *env, const session::config::c
struct WithProProofInfoClassInfo : public JavaClassInfo {
jmethodID proProofInfo_getter;

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

static const WithProProofInfoClassInfo& get(JNIEnv *env, jobject obj) {
static WithProProofInfoClassInfo instance(env, obj);
static const WithProProofInfoClassInfo& get(JNIEnv *env) {
static WithProProofInfoClassInfo instance(env);
return instance;
}
};
Expand Down Expand Up @@ -133,7 +133,7 @@ session::config::convo::one_to_one deserialize_one_to_one(JNIEnv *env, jobject i
r.unread = env->CallBooleanMethod(info, class_info.unread_getter);

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

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

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

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