unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, 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	[thread overview]
Message-ID: <20200413021016.2799496-2-david@tethera.net> (raw)
In-Reply-To: <20200413021016.2799496-1-david@tethera.net>

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

  reply	other threads:[~2020-04-13  2:10 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-12 17:34 [PATCH] test: add known_broken test for dumping large stored queries David Bremner
2020-04-12 20:39 ` David Bremner
2020-04-13  2:10 ` David Bremner
2020-04-13  2:10   ` David Bremner [this message]
2020-04-13  2:10   ` [PATCH 2/5] status: add print_status_gzbytes David Bremner
2020-04-13  2:10   ` [PATCH 3/5] cli/dump: define GZPRINTF macro and use it in place of gzprintf David Bremner
2020-04-13  8:52     ` Tomi Ollila
2020-04-13 11:21       ` David Bremner
2020-04-13 11:37         ` David Bremner
2020-04-13  2:10   ` [PATCH 4/5] cli/dump: define GZPUTS and use it in notmuch-dump David Bremner
2020-04-13  2:10   ` [PATCH 5/5] cli/dump: replace use of gzprintf with gzputs for config values David Bremner
2020-04-13  8:47 ` [PATCH] test: add known_broken test for dumping large stored queries Tomi Ollila
2020-04-13  9:43 ` Thomas Schneider
2020-04-13 12:36   ` [PATCH 1/6] " David Bremner
2020-04-13 12:36     ` [PATCH 2/6] util/zlib-extra.c: don't pass NULL to gzerror David Bremner
2020-04-13 12:36     ` [PATCH 3/6] status: add print_status_gzbytes David Bremner
2020-04-13 12:36     ` [PATCH 4/6] cli/dump: define GZPRINTF macro and use it in place of gzprintf David Bremner
2020-04-13 14:12       ` Tomi Ollila
2020-04-13 12:36     ` [PATCH 5/6] cli/dump: define GZPUTS and use it in notmuch-dump David Bremner
2020-04-13 12:36     ` [PATCH 6/6] cli/dump: replace use of gzprintf with gzputs for config values David Bremner
2020-04-13 23:03     ` [PATCH 1/6] test: add known_broken test for dumping large stored queries David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200413021016.2799496-2-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).