From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QNffMDLKk148IwAA0tVLHw (envelope-from ) for ; Mon, 13 Apr 2020 02:10:58 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KD6kGDXKk160dQAAbx9fmQ (envelope-from ) for ; Mon, 13 Apr 2020 02:11:01 +0000 Received: from arlo.cworth.org (arlo.cworth.org [50.126.95.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 54EBB682AA5 for ; Mon, 13 Apr 2020 02:10:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 3B6F46DE14AA; Sun, 12 Apr 2020 19:10:42 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YX-KVq3dXcUo; Sun, 12 Apr 2020 19:10:41 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id 904196DE146C; Sun, 12 Apr 2020 19:10:29 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 05C056DE0EF3 for ; Sun, 12 Apr 2020 19:10:27 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CgOMAIlyzUib for ; Sun, 12 Apr 2020 19:10:26 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 702B26DE0EED for ; Sun, 12 Apr 2020 19:10:26 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.92) (envelope-from ) id 1jNoYL-0003iu-Hz; Sun, 12 Apr 2020 22:10:25 -0400 Received: (nullmailer pid 2799594 invoked by uid 1000); Mon, 13 Apr 2020 02:10:19 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [PATCH 1/5] util/zlib-extra.c: don't pass NULL to gzerror. Date: Sun, 12 Apr 2020 23:10:12 -0300 Message-Id: <20200413021016.2799496-2-david@tethera.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200413021016.2799496-1-david@tethera.net> References: <20200412173432.2575450-1-david@tethera.net> <20200413021016.2799496-1-david@tethera.net> MIME-Version: 1.0 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: notmuch-bounces@notmuchmail.org Sender: "notmuch" X-Scanner: scn0 X-Spam-Score: -0.01 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 50.126.95.6 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Scan-Result: default: False [-0.01 / 13.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; GENERIC_REPUTATION(0.00)[-0.44943446418359]; FORGED_SENDER_MAILLIST(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; IP_REPUTATION_HAM(0.00)[asn: 27017(-0.18), country: US(-0.01), ip: 50.126.95.6(-0.45)]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[notmuch@notmuchmail.org]; DMARC_NA(0.00)[tethera.net]; HAS_LIST_UNSUB(-0.01)[]; SPF_REPUTATION_HAM(0.00)[-0.44787670012528]; MX_GOOD(-0.50)[cached: notmuchmail.org]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; MAILLIST(-0.20)[mailman]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:27017, ipnet:50.126.64.0/18, country:US]; FROM_NEQ_ENVFROM(0.00)[david@tethera.net,notmuch-bounces@notmuchmail.org]; RCVD_COUNT_SEVEN(0.00)[8] X-TUID: ZcQEEaR49hg7 Although (as of 1.2.11) zlib checks this parameter before writing to it, the docs don't promise to keep doing so, so be safe. --- util/zlib-extra.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/zlib-extra.c b/util/zlib-extra.c index f691cccf..e17a9731 100644 --- a/util/zlib-extra.c +++ b/util/zlib-extra.c @@ -79,8 +79,10 @@ gz_getline (void *talloc_ctx, char **bufptr, ssize_t *bytes_read, gzFile stream) const char * gz_error_string (util_status_t status, gzFile file) { + int dummy; + if (status == UTIL_GZERROR) - return gzerror (file, NULL); + return gzerror (file, &dummy); else return util_error_string (status); } -- 2.25.1