--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 54F99431FAF\r
+ for <notmuch@notmuchmail.org>; Wed, 8 Aug 2012 14:23:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 1+jqppWpAjqF for <notmuch@notmuchmail.org>;\r
+ Wed, 8 Aug 2012 14:23:45 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7BFDF431FAE\r
+ for <notmuch@notmuchmail.org>; Wed, 8 Aug 2012 14:23:45 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SzDjA-0003DQ-Ot; Wed, 08 Aug 2012 22:23:41 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SzDjA-0004T9-EB; Wed, 08 Aug 2012 22:23:40 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: [PATCH] sprinters: bugfix when NULL passed for a string.\r
+In-Reply-To: <1344389313-7886-1-git-send-email-amdragon@mit.edu>\r
+References: <1344374501-28185-1-git-send-email-amdragon@mit.edu>\r
+ <1344389313-7886-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 08 Aug 2012 22:23:33 +0100\r
+Message-ID: <87mx25ulgq.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: fdbcd46c1208c4a38bcc75ec23a98fe0 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 08 Aug 2012 21:23:46 -0000\r
+\r
+\r
+The string function in a sprinter may be called with a NULL string\r
+pointer (eg if a header is absent). This causes a segfault. We fix\r
+this by checking for a null pointer in the string functions and update\r
+the sprinter documentation.\r
+\r
+At the moment some output when format=text is done directly rather than\r
+via an sprinter: in that case a null pointer is passed to printf or\r
+similar and a "(null)" appears in the output. That behaviour is not\r
+changed in this patch.\r
+---\r
+\r
+This is the same as id:"874noe1o0r.fsf@qmul.ac.uk" except for being\r
+based on top of the test in the parent message, and marking the broken\r
+test fixed.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+ sprinter-json.c | 2 ++\r
+ sprinter-text.c | 2 ++\r
+ sprinter.h | 4 +++-\r
+ test/missing-headers | 2 --\r
+ 4 files changed, 7 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/sprinter-json.c b/sprinter-json.c\r
+index c9b6835..0a07790 100644\r
+--- a/sprinter-json.c\r
++++ b/sprinter-json.c\r
+@@ -118,6 +118,8 @@ json_string_len (struct sprinter *sp, const char *val, size_t len)\r
+ static void\r
+ json_string (struct sprinter *sp, const char *val)\r
+ {\r
++ if (val == NULL)\r
++ val = "";\r
+ json_string_len (sp, val, strlen (val));\r
+ }\r
+ \r
+diff --git a/sprinter-text.c b/sprinter-text.c\r
+index dfa54b5..10343be 100644\r
+--- a/sprinter-text.c\r
++++ b/sprinter-text.c\r
+@@ -38,6 +38,8 @@ text_string_len (struct sprinter *sp, const char *val, size_t len)\r
+ static void\r
+ text_string (struct sprinter *sp, const char *val)\r
+ {\r
++ if (val == NULL)\r
++ val = "";\r
+ text_string_len (sp, val, strlen (val));\r
+ }\r
+ \r
+diff --git a/sprinter.h b/sprinter.h\r
+index 5f43175..912a526 100644\r
+--- a/sprinter.h\r
++++ b/sprinter.h\r
+@@ -27,7 +27,9 @@ typedef struct sprinter {\r
+ * a list or map, followed or preceded by separators). For string\r
+ * and string_len, the char * must be UTF-8 encoded. string_len\r
+ * allows non-terminated strings and strings with embedded NULs\r
+- * (though the handling of the latter is format-dependent).\r
++ * (though the handling of the latter is format-dependent). For\r
++ * string (but not string_len) the string pointer passed may be\r
++ * NULL.\r
+ */\r
+ void (*string) (struct sprinter *, const char *);\r
+ void (*string_len) (struct sprinter *, const char *, size_t);\r
+diff --git a/test/missing-headers b/test/missing-headers\r
+index e79f922..f14b878 100755\r
+--- a/test/missing-headers\r
++++ b/test/missing-headers\r
+@@ -29,7 +29,6 @@ thread:XXX 2001-01-05 [1/1] (null); (inbox unread)\r
+ thread:XXX 1970-01-01 [1/1] Notmuch Test Suite; (inbox unread)"\r
+ \r
+ test_begin_subtest "Search: json"\r
+-test_subtest_known_broken\r
+ output=$(notmuch search --format=json '*' | notmuch_search_sanitize)\r
+ test_expect_equal_json "$output" '\r
+ [\r
+@@ -93,7 +92,6 @@ Body\r
+ \f\r
+message}"\r
+ \r
+ test_begin_subtest "Show: json"\r
+-test_subtest_known_broken\r
+ output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)\r
+ test_expect_equal_json "$output" '\r
+ [\r
+-- \r
+1.7.9.1\r
+\r
+\r
projects / notmuch-archives.git / commitdiff