GNU bug report logs - #75911
maint: fix s390 buffer flushes

Previous Next

Package: gzip;

Reported by: Eduard Stefes <eduard.stefes <at> ibm.com>

Date: Tue, 28 Jan 2025 14:38:02 UTC

Severity: normal

Merged with 74651, 75924

Done: Paul Eggert <eggert <at> cs.ucla.edu>

Bug is archived. No further changes may be made.

Full log

Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Eduard Stefes <Eduard.Stefes <at> ibm.com>
To: "bug-gzip <at> gnu.org" <bug-gzip <at> gnu.org>, "iii <at> linux.ibm.com"
 <iii <at> linux.ibm.com>, Eduard Stefes <Eduard.Stefes <at> ibm.com>
Cc: "andreas.hasenack <at> canonical.com" <andreas.hasenack <at> canonical.com>
Subject: Re: maint: fix s390 buffer flushes
Date: Wed, 29 Jan 2025 14:17:27 +0000

Hi,

Thx for the review. I'll resend with the corrections. 

On Tue, 2025-01-28 at 15:44 +0100, Ilya Leoshkevich wrote:
> On Tue, 2025-01-28 at 15:37 +0100, Eduard Stefes wrote:
> 
> LGTM, but I have several stylistic comments.
> 
> > Problem reported by Nick Rosbrook in:
> > https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/2083700
> > 
> > align the behavior of dfltcc_inflate to do the same as gzip_inflate
> > when it hits a premature EOF
> 
> Looking at the style of other gzip commits:
> I would capitalize "Align" and add a dot at the end.
> 
> > ---
> >  dfltcc.c    | 7 ++++++-
> >  tests/hufts | 6 ++++--
> >  2 files changed, 10 insertions(+), 3 deletions(-)
> 
> 
> > diff --git a/dfltcc.c b/dfltcc.c
> > index 811c1f8..07726cb 100644
> > --- a/dfltcc.c
> > +++ b/dfltcc.c
> > @@ -18,6 +18,7 @@
> >  #include <config.h>
> >  
> >  #include <stdlib.h>
> > +#include <errno.h>
> >  
> >  #ifdef HAVE_SYS_SDT_H
> >  # include <sys/sdt.h>
> > @@ -437,7 +438,11 @@ dfltcc_inflate ()
> >            if (fill_inbuf (1) == EOF)
> >              {
> >                /* Premature EOF.  */
> > -              return 2;
> > +              flush_outbuf();
> 
> Here and below: there should be a space before ().
> 
> > +              errno = 0;
> > +              read_error();
> > +              /* Premature EOF.  */
> 
> Duplicate comment, I would drop this copy.
> 
> > +              __builtin_unreachable();
> >              }
> >            inptr = 0;
> >          }
> 
> [...]
> 
> Best regards,
> Ilya

-- 
Eduard Stefes <Eduard.Stefes <at> ibm.com>
This bug report was last modified 39 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.