From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#63832: fix failed inflation of .el.gz archives due to passing empty buffer to inflate() Date: Fri, 02 Jun 2023 15:04:50 +0300 Message-ID: <83h6rqax3x.fsf@gnu.org> References: Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27766"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 63832@debbugs.gnu.org To: Amritpal Singh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 02 14:05:38 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q53XF-000723-AQ for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 02 Jun 2023 14:05:37 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q53Wn-0001pa-42; Fri, 02 Jun 2023 08:05:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q53Wi-0001e7-0E for bug-gnu-emacs@gnu.org; Fri, 02 Jun 2023 08:05:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q53Wg-0002gn-1L for bug-gnu-emacs@gnu.org; Fri, 02 Jun 2023 08:05:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q53Wf-0001v3-Sl for bug-gnu-emacs@gnu.org; Fri, 02 Jun 2023 08:05:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Jun 2023 12:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63832 X-GNU-PR-Package: emacs Original-Received: via spool by 63832-submit@debbugs.gnu.org id=B63832.16857074527306 (code B ref 63832); Fri, 02 Jun 2023 12:05:01 +0000 Original-Received: (at 63832) by debbugs.gnu.org; 2 Jun 2023 12:04:12 +0000 Original-Received: from localhost ([127.0.0.1]:39208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q53Vs-0001tl-CH for submit@debbugs.gnu.org; Fri, 02 Jun 2023 08:04:12 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:38002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q53Vp-0001tT-6O; Fri, 02 Jun 2023 08:04:11 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q53Vj-0002bf-Ss; Fri, 02 Jun 2023 08:04:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=+10zRigs0aLG2cpE6NABdq9YlJU52SkfK4XDdUaUdOw=; b=Y25hUMUO7H1x esXKJ4kj5rm6Zj1x/3e3bmFfLUWpj3zqLJ7yLh4wRA/zrr+cToFOh9NyXjm9EuQg9mknVF/Jp/pwj KxXYaNK/Byx1aPh2OQhNIl3xIFMfdhHqQN3QjhBWwb3f2OHiwdriiJxa1hU/7cVwkv/eQOt9ZZMRg B6QKfaK31BPJyyBgSzshbmtYZPsAt2OUzM6w1guFKhF1QK/To1Lfvl9lhCxwEmrlWuRW+GAvpZpU6 j6lSx4GdWyGAWdLfsoTE9lhNK3zK8yrJRPjncxcYM4qhGAwIF2jgHiILab+e7dV9Ig4XmOdkHxUMS BSEnvh7BYi2dRdC7dBUdeQ==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q53Vj-0003T0-CZ; Fri, 02 Jun 2023 08:04:03 -0400 In-Reply-To: (message from Amritpal Singh on Fri, 2 Jun 2023 12:21:07 +0530) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:262753 Archived-At: merge 63832 63831 thanks > From: Amritpal Singh > Date: Fri, 2 Jun 2023 12:21:07 +0530 > > Compile emacs with the system's gzip program set to `pigz`. > Run emacs and then `M-x eww RET` > > Expected behavior: > Enter URL prompt in mini-buffer > > Actual behavior: > hashing failed '/usr/share/emacs/30.0.50/lisp/gnus/gnus.el.gz' > > Report: > The bug has been reproduced on emacs version 29.0.91 and HEAD which > seems to be at 30.0.50. > Later, a copy of the aforementioned file was saved somewhere else and > the program was uninstalled. Then emacs was recompiled with system's > gzip program set to GNU gzip and the initial steps were repeated and > the expected behavior was the result. > This lead to believing either that there's a bug with how zlib's > `inflate()` handles archives or emacs code was having an issue with > archives files. > > The hashes for gz archives generated with different programs were as follows > > md5sum gnus-gzip.el.gz > edb3d0ffba7f19ff1d4ec3f889609e8a gnus-gzip.el.gz > > md5sum gnus.el.gz > 985deaaec6a5845ac8d6bd9648957b50 gnus.el.gz > > And when uncompressing these archives, the resulting file was the same > and the hash for the files was the same (omitted for brevity). > > Now after logging some code in $EMACS_REPO/src/decompress.c, it was > learned that in the pigz specific case, `inflate()` was returning > Z_BUF_ERROR(-5) which is an indicator for zstream's either `avail_in` > or `avail_out` fields are 0. > > Observing the code in `$EMACS_REPO/src/decompress.c` > L154: > } while (!stream.avail_out); > only checks stream.avail_out and not stream.avail_in which also might > have been set to 0. A special case here can be constructed where > `avail_in` is 0, and the code keeps looping even though our input > buffer is empty and thus causing a Z_BUF_ERROR. Placing a simple check > for it fixes the bug in pigz's gz archives case and does not cause any > issue with gzip archives. > > A patch with a simple fix is attached below > > ============================ > > >From ffa8e140ed8b093c60f1238bf76935e815e82a21 Mon Sep 17 00:00:00 2001 > From: icebarf > Date: Fri, 2 Jun 2023 10:51:21 +0530 > Subject: [PATCH] check stream.avail_in as well when looping to inflate gz > archive > > --- > src/decompress.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/decompress.c b/src/decompress.c > index 6ef17db..162f616 100644 > --- a/src/decompress.c > +++ b/src/decompress.c > @@ -151,7 +151,7 @@ md5_gz_stream (FILE *source, void *resblock) > return -1; > > accumulate_and_process_md5 (out, MD5_BLOCKSIZE - stream.avail_out, &ctx); > - } while (!stream.avail_out); > + } while (stream.avail_in && !stream.avail_out); > > } while (res != Z_STREAM_END); > > -- > 2.40.1 > > ========== > > In GNU Emacs 29.0.91 (build 1, x86_64-pc-linux-gnu, GTK+ Version > 3.24.37, cairo version 1.16.0) of 2023-06-02 built on box > System Description: KISS Linux > > Configured using: > 'configure --prefix=/usr --enable-link-time-optimization --with-cairo > --with-gnutls --with-imagemagick --with-modules > --with-native-compilation --with-pgtk --with-jpeg --with-tiff > --with-png --with-rsvg --with-webp --without-dbus --without-lcms2 > --without-libsystemd --without-gif --without-gconf --without-gsettings > --without-m17n-flt --without-selinux --without-x --without-xft > --without-xaw3d --without-xim --without-xdbe 'CFLAGS=-O2 -pipe > -march=native -mtune=native'' This is a duplicate of bug#63831; merged.