From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 701157B1C8 for ; Tue, 11 May 2021 16:16:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6624E22FB7 for ; Tue, 11 May 2021 16:16:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F030022FA8 for ; Tue, 11 May 2021 16:16:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BD2FF42A39 for ; Tue, 11 May 2021 16:16:44 +0200 (CEST) Message-ID: Date: Tue, 11 May 2021 16:16:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:89.0) Gecko/20100101 Thunderbird/89.0 Content-Language: en-US To: Mira Limbeck , pmg-devel@lists.proxmox.com References: <20210429132508.29570-1-m.limbeck@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210429132508.29570-1-m.limbeck@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.006 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Subject: [pmg-devel] applied: [PATCH log-tracker] fix mutable borrow panic on duplicate msgid X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 14:16:45 -0000 On 29.04.21 15:25, Mira Limbeck wrote: > Because of the relay before lmtp issue we now add and remove QEntrys > based on their message-id. But if the cleanup line containing the > message-id appears twice in the log for the same QEntry it keeps a weak > reference to itself which leads to a panic because of a mutable borrow > while it is already mutably borrowed in the 'finalize' function. > > To circumvent this we check after the lookup if it is the same QEntry > and if so, insert it again with that message-id in the lookup table and > don't add the weak reference. > > Signed-off-by: Mira Limbeck > --- > src/main.rs | 11 ++++- > tests/test_input_after_queue_duplicate_msgid | 20 +++++++++ > tests/test_output_after_queue_duplicate_msgid | 45 +++++++++++++++++++ > tests/tests_after_queue.rs | 23 ++++++++++ > 4 files changed, 97 insertions(+), 2 deletions(-) > create mode 100644 tests/test_input_after_queue_duplicate_msgid > create mode 100644 tests/test_output_after_queue_duplicate_msgid > > applied, with Aarons T-b, thanks!