Skip to content

Commit 8fe608a

Browse files
committed
fix: attempt to metaMerge only if we have something to merge
1 parent 526e771 commit 8fe608a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"main": "index.js",
33
"name": "libsession_util_nodejs",
44
"description": "Wrappers for the Session Util Library",
5-
"version": "0.4.11",
5+
"version": "0.4.12",
66
"license": "GPL-3.0",
77
"author": {
88
"name": "Oxen Project",

src/groups/meta_group_wrapper.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,10 @@ Napi::Value MetaGroupWrapper::metaMerge(const Napi::CallbackInfo& info) {
337337
toCppBufferView(itemObject.Get("data"), "meta.merge"));
338338
}
339339

340-
auto info_merged = this->meta_group->info->merge(conf_strs);
341-
count_merged += info_merged.size();
340+
if(conf_strs.size()){
341+
auto info_merged = this->meta_group->info->merge(conf_strs);
342+
count_merged += info_merged.size();
343+
}
342344
}
343345

344346
if (!groupMember.IsNull() && !groupMember.IsUndefined()) {
@@ -362,9 +364,10 @@ Napi::Value MetaGroupWrapper::metaMerge(const Napi::CallbackInfo& info) {
362364
toCppBufferView(itemObject.Get("data"), "meta.merge"));
363365
}
364366

365-
auto member_merged = this->meta_group->members->merge(conf_strs);
366-
367-
count_merged += member_merged.size();
367+
if(conf_strs.size()){
368+
auto member_merged = this->meta_group->members->merge(conf_strs);
369+
count_merged += member_merged.size();
370+
}
368371
}
369372

370373
if (this->meta_group->keys->needs_rekey()) {

0 commit comments

Comments
 (0)