[PATCH] Handle errors in mime_node_open

diff --git a/f2/71329d9ec37cb1471fda69a70c72fc8ff6503a b/f2/71329d9ec37cb1471fda69a70c72fc8ff6503a
new file mode 100644 (file)
index 0000000..3217bff
--- /dev/null
+++ b/f2/71329d9ec37cb1471fda69a70c72fc8ff6503a
@@ -0,0 +1,109 @@
+Return-Path: <amthrax@drake.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 2E792431FBC\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:27:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 UCfN5K-MPSUX for <notmuch@notmuchmail.org>;\r
+       Tue,  6 Mar 2012 10:27:04 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 999A2431FAE\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:27:04 -0800 (PST)\r
+X-AuditID: 1209190f-b7f8a6d000000914-d7-4f5656f78c6e\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 59.A7.02324.7F6565F4; Tue,  6 Mar 2012 13:27:04 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q26IR3TN017019; \r
+       Tue, 6 Mar 2012 13:27:03 -0500\r
+Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26IR0gk010146\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 6 Mar 2012 13:27:02 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S4z6C-0003am-4q; Tue, 06 Mar 2012 18:27:00 +0000\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Handle errors in mime_node_open\r
+Date: Tue,  6 Mar 2012 18:26:57 +0000\r
+Message-Id: <1331058417-13776-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <87d38w2e7h.fsf@zancas.localnet>\r
+References: <87d38w2e7h.fsf@zancas.localnet>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrvsjLMzfYN5hRovrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY9OC3WwFOzgqOnf3Mjcw3mTrYuTkkBAwkXi77zojhC0mceHe\r
+       eqA4F4eQwD5GidUzVrJAOOsZJW483c0I4Rxkkjg87TUzhDOfUWLrn3tg/WwCGhLb9i8Hs0UE\r
+       pCV23p3N2sXIwcEsoCbxp0sFJCwsYCBxa90DFhCbRUBV4u7yXewgNq+Ag8T3v/uZIM5QkDi3\r
+       +hxYnFNAV+Lo5MnMILaQgI5E55dXrBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszLSy3SNdHL\r
+       zSzRS00p3cQIChtOSf4djN8OKh1iFOBgVOLhrdIN8xdiTSwrrsw9xCjJwaQkyjsvGCjEl5Sf\r
+       UpmRWJwRX1Sak1p8iFGCg1lJhPfb+1B/Id6UxMqq1KJ8mJQ0B4uSOK+a1js/IYH0xJLU7NTU\r
+       gtQimKwMB4eSBK8NMD6EBItS01Mr0jJzShDSTBycIMN5gIa7gtTwFhck5hZnpkPkTzEqSonz\r
+       eoIkBEASGaV5cL2wuH7FKA70ijBvAEgVDzAlwHW/AhrMBDS4TTkYZHBJIkJKqoFxUU7kvf4V\r
+       TqL1X9QLY36HL1NmsmPtM2NIsL8Rv+kMT+L/cCfzVabv/5VGrK5mVtyycrv+lPavHV7+a3rv\r
+       1LBd/HBZ3G+yduBjI/5jMy+VvC49dv6eTXeJcIbrGSYL49o7H6eZldw1zWW3/vMxa+5SZ+Pm\r
+       voWqFdVTbjKxmC4X13Ezna0rtEyJpTgj0VCLuag4EQAny6hCxgIAAA==\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: Tue, 06 Mar 2012 18:27:05 -0000\r
+\r
+---\r
+ mime-node.c |   15 +++++++++++++++\r
+ 1 files changed, 15 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/mime-node.c b/mime-node.c\r
+index d6b4506..a95bdab 100644\r
+--- a/mime-node.c\r
++++ b/mime-node.c\r
+@@ -97,11 +97,26 @@ mime_node_open (const void *ctx, notmuch_message_t *message,\r
+     }\r
+ \r
+     mctx->stream = g_mime_stream_file_new (mctx->file);\r
++    if (!mctx->stream) {\r
++      fprintf (stderr, "Out of memory.\n");\r
++      status = NOTMUCH_STATUS_OUT_OF_MEMORY;\r
++      goto DONE;\r
++    }\r
+     g_mime_stream_file_set_owner (GMIME_STREAM_FILE (mctx->stream), FALSE);\r
+ \r
+     mctx->parser = g_mime_parser_new_with_stream (mctx->stream);\r
++    if (!mctx->parser) {\r
++      fprintf (stderr, "Out of memory.\n");\r
++      status = NOTMUCH_STATUS_OUT_OF_MEMORY;\r
++      goto DONE;\r
++    }\r
+ \r
+     mctx->mime_message = g_mime_parser_construct_message (mctx->parser);\r
++    if (!mctx->mime_message) {\r
++      fprintf (stderr, "Failed to parse %s\n", filename);\r
++      status = NOTMUCH_STATUS_FILE_ERROR;\r
++      goto DONE;\r
++    }\r
+ \r
+     mctx->cryptoctx = cryptoctx;\r
+     mctx->decrypt = decrypt;\r
+-- \r
+1.7.7.3\r
+\r