From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <c.ebner@proxmox.com>
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 26465EB86
 for <pbs-devel@lists.proxmox.com>; Wed, 27 Sep 2023 13:53:39 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 087E0B869
 for <pbs-devel@lists.proxmox.com>; Wed, 27 Sep 2023 13:53:39 +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
 for <pbs-devel@lists.proxmox.com>; Wed, 27 Sep 2023 13:53:37 +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 BB37B48E40
 for <pbs-devel@lists.proxmox.com>; Wed, 27 Sep 2023 13:53:37 +0200 (CEST)
Date: Wed, 27 Sep 2023 13:53:36 +0200 (CEST)
From: Christian Ebner <c.ebner@proxmox.com>
To: Wolfgang Bumiller <w.bumiller@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Message-ID: <1407141950.5078.1695815616978@webmail.proxmox.com>
In-Reply-To: <l3svlvu3dgfouxc5lfwjrcv2fuc2dddtbt4sjpqtsbh2g4s7ex@xv4hid5l7efj>
References: <20230922071621.12670-1-c.ebner@proxmox.com>
 <20230922071621.12670-3-c.ebner@proxmox.com>
 <l3svlvu3dgfouxc5lfwjrcv2fuc2dddtbt4sjpqtsbh2g4s7ex@xv4hid5l7efj>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Priority: 3
Importance: Normal
X-Mailer: Open-Xchange Mailer v7.10.6-Rev50
X-Originating-Client: open-xchange-appsuite
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.099 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 DMARC_MISSING             0.1 Missing DMARC policy
 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. [mod.rs]
Subject: Re: [pbs-devel] [RFC pxar 2/20] fix #3174: decoder: factor out
 skip_bytes from skip_entry
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
 <pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 27 Sep 2023 11:53:39 -0000


> On 27.09.2023 13:32 CEST Wolfgang Bumiller <w.bumiller@proxmox.com> wrote:
> 
>  
> On Fri, Sep 22, 2023 at 09:16:03AM +0200, Christian Ebner wrote:
> > Allows to skip bytes independently of the current entries header, as is
> > implemented by skip_entry.
> > 
> > Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> > ---
> >  src/decoder/mod.rs | 19 ++++++++++++-------
> >  1 file changed, 12 insertions(+), 7 deletions(-)
> > 
> > diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
> > index d1fb911..2ca263b 100644
> > --- a/src/decoder/mod.rs
> > +++ b/src/decoder/mod.rs
> > @@ -562,20 +562,25 @@ impl<I: SeqRead> DecoderImpl<I> {
> >      // These utilize additional information and hence are not part of the `dyn SeqRead` impl.
> >      //
> >  
> > -    async fn skip_entry(&mut self, offset: u64) -> io::Result<()> {
> > -        let mut len = self.current_header.content_size() - offset;
> > +    async fn skip_bytes(&mut self, len: usize) -> io::Result<()> {
> 
> I think `len` here should be an `u64`, `skip_entry` otherwise gets
> limited to 32 bits on some systems for no reason :-)

Yes, I will change this in the next version of the patch series, thx!

> 
> > +        let mut remaining = len;
> >          let scratch = scratch_buffer();
> > -        while len >= (scratch.len() as u64) {
> > +        while remaining >= scratch.len() {
> >              seq_read_exact(&mut self.input, scratch).await?;
> > -            len -= scratch.len() as u64;
> > +            remaining -= scratch.len();
> >          }
> > -        let len = len as usize;
> > -        if len > 0 {
> > -            seq_read_exact(&mut self.input, &mut scratch[..len]).await?;
> > +        if remaining > 0 {
> > +            seq_read_exact(&mut self.input, &mut scratch[..remaining]).await?;
> >          }
> >          Ok(())
> >      }
> >  
> > +    async fn skip_entry(&mut self, offset: u64) -> io::Result<()> {
> > +        let len =
> > +            usize::try_from(self.current_header.content_size() - offset).map_err(io_err_other)?;
> > +        self.skip_bytes(len).await
> > +    }
> > +
> >      async fn read_entry_as_bytes(&mut self) -> io::Result<Vec<u8>> {
> >          let size = usize::try_from(self.current_header.content_size()).map_err(io_err_other)?;
> >          let data = seq_read_exact_data(&mut self.input, size).await?;
> > -- 
> > 2.39.2