[PATCH v2 03/12] lib: Handle empty date value

diff --git a/20/6581131a6a21c9b4f7bf5689f04b19c4b62e2c b/20/6581131a6a21c9b4f7bf5689f04b19c4b62e2c
new file mode 100644 (file)
index 0000000..51eb10c
--- /dev/null
+++ b/20/6581131a6a21c9b4f7bf5689f04b19c4b62e2c
@@ -0,0 +1,101 @@
+Return-Path: <aclements@csail.mit.edu>\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 255A8431FD5\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:18:04 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[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 8nIfRIr8zn3I for <notmuch@notmuchmail.org>;\r
+       Mon,  6 Oct 2014 16:18:00 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
+       [18.9.25.12])\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 C7E8F431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:17:36 -0700 (PDT)\r
+X-AuditID: 1209190c-f795e6d000006c66-2a-54332310faa0\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 39.75.27750.01323345; Mon,  6 Oct 2014 19:17:36 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s96NHPCV032087; \r
+       Mon, 6 Oct 2014 19:17:25 -0400\r
+Received: from drake.dyndns.org ([12.185.136.2]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s96NHMLY014470\r
+       (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+       Mon, 6 Oct 2014 19:17:24 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
+       (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XbHWr-0001JQ-NV; Mon, 06 Oct 2014 17:17:21 -0600\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 03/12] lib: Handle empty date value\r
+Date: Mon,  6 Oct 2014 17:17:09 -0600\r
+Message-Id: <1412637438-4821-4-git-send-email-aclements@csail.mit.edu>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+References: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrJIsWRmVeSWpSXmKPExsUixG6nriugbBxi8GcXr8WN1m5Gi+s3ZzI7\r
+       MHk8W3WL2WPLoffMAUxRXDYpqTmZZalF+nYJXBk7V31hK9jIWvH44jGmBsblLF2MnBwSAiYS\r
+       d6+3sULYYhIX7q1n62Lk4hASmM0ksefBVSYIZwOjxP5Z+6AyS5kkel/+ZgdpERJYwiixtCUO\r
+       xGYT0JdYsXYS2CgRAWmJnXdng9nMApYSV7+2M4HYwgJmErdfr2QDsVkEVCV2/vnFDGLzCrhJ\r
+       3D4zgw3iDDmJDbv/M4LYnALuEmuuTGaF2OUm8fznU5YJjPwLGBlWMcqm5Fbp5iZm5hSnJusW\r
+       Jyfm5aUW6Rrq5WaW6KWmlG5iBIUSpyTPDsY3B5UOMQpwMCrx8EbsMAwRYk0sK67MPcQoycGk\r
+       JMo7h904RIgvKT+lMiOxOCO+qDQntfgQowQHs5IIL9dvoxAh3pTEyqrUonyYlDQHi5I476Yf\r
+       fCFCAumJJanZqakFqUUwWRkODiUJ3t+KQEMFi1LTUyvSMnNKENJMHJwgw3mAhv8DqeEtLkjM\r
+       Lc5Mh8ifYtTlaGl628skxJKXn5cqJc4bDFIkAFKUUZoHNweWAl4xigO9JcwrrgRUxQNMH3CT\r
+       XgEtYQJaYjpHH2RJSSJCSqqBMbVf6Dabz0oXyQuFtzIyXp9LWJgneX12r9PvnKc8MhmMCy4H\r
+       1ioLPpxUPbFzTpyW0eULbPzMxg/nnpvy/5JGzPu1ond/OelwhSTs8dv6ca7j07iTnx4/0vBy\r
+       1rZcbKLpulP5t1RkaEqX1qHgqb9a5ew677Ie8H38RuShNuPjk9NL7ir8uzdBWomlOCPRUIu5\r
+       qDgRABEbw9HcAgAA\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: Mon, 06 Oct 2014 23:18:04 -0000\r
+\r
+From: Austin Clements <amdragon@mit.edu>\r
+\r
+In the interest of robustness, avoid undefined behavior of\r
+sortable_unserialise if the date value is missing.  This shouldn't\r
+happen now, but ghost messages will have blank date values.\r
+---\r
+ lib/message.cc | 3 +++\r
+ 1 file changed, 3 insertions(+)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index bbfc250..38bc929 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -896,6 +896,9 @@ notmuch_message_get_date (notmuch_message_t *message)\r
+       return 0;\r
+     }\r
+ \r
++    if (value.empty ())\r
++      /* sortable_unserialise is undefined on empty string */\r
++      return 0;\r
+     return Xapian::sortable_unserialise (value);\r
+ }\r
+ \r
+-- \r
+2.1.0\r
+\r