Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 14:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: add_or_lookup_key_contacts*(): Advance fingerprint_iter on invalid address

Browse Source
This commit is contained in:
iequidoo
2026-01-27 05:34:27 -03:00
committed by iequidoo
parent 2019debe99
commit fe826f762e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/receive_imf.rs
View File

@@ -4029,12 +4029,13 @@ async fn add_or_lookup_key_contacts(
let mut contact_ids = Vec::new(); let mut contact_ids = Vec::new();
let mut fingerprint_iter = fingerprints.iter(); let mut fingerprint_iter = fingerprints.iter();
for info in address_list { for info in address_list {
let fp = fingerprint_iter.next();
let addr = &info.addr; let addr = &info.addr;
if !may_be_valid_addr(addr) { if !may_be_valid_addr(addr) {
contact_ids.push(None); contact_ids.push(None);
continue; continue;
} }
let fingerprint: String = if let Some(fp) = fingerprint_iter.next() { let fingerprint: String = if let Some(fp) = fp {
// Iterator has not ran out of fingerprints yet. // Iterator has not ran out of fingerprints yet.
fp.hex() fp.hex()
} else if let Some(key) = gossiped_keys.get(addr) { } else if let Some(key) = gossiped_keys.get(addr) {
@@ -4209,13 +4210,14 @@ async fn lookup_key_contacts_fallback_to_chat(
let mut contact_ids = Vec::new(); let mut contact_ids = Vec::new();
let mut fingerprint_iter = fingerprints.iter(); let mut fingerprint_iter = fingerprints.iter();
for info in address_list { for info in address_list {
let fp = fingerprint_iter.next();
let addr = &info.addr; let addr = &info.addr;
if !may_be_valid_addr(addr) { if !may_be_valid_addr(addr) {
contact_ids.push(None); contact_ids.push(None);
continue; continue;
} }
if let Some(fp) = fingerprint_iter.next() { if let Some(fp) = fp {
// Iterator has not ran out of fingerprints yet. // Iterator has not ran out of fingerprints yet.
let display_name = info.display_name.as_deref(); let display_name = info.display_name.as_deref();
let fingerprint: String = fp.hex(); let fingerprint: String = fp.hex();