f2/71329d9ec37cb1471fda69a70c72fc8ff6503a

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 2E792431FBC\r
   6         for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:27:05 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id UCfN5K-MPSUX for <notmuch@notmuchmail.org>;\r
  16         Tue,  6 Mar 2012 10:27:04 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 999A2431FAE\r
  20         for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:27:04 -0800 (PST)\r
  21 X-AuditID: 1209190f-b7f8a6d000000914-d7-4f5656f78c6e\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 59.A7.02324.7F6565F4; Tue,  6 Mar 2012 13:27:04 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q26IR3TN017019; \r
  27         Tue, 6 Mar 2012 13:27:03 -0500\r
  28 Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26IR0gk010146\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Tue, 6 Mar 2012 13:27:02 -0500 (EST)\r
  34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amthrax@drake.mit.edu>)\r
  36         id 1S4z6C-0003am-4q; Tue, 06 Mar 2012 18:27:00 +0000\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH] Handle errors in mime_node_open\r
  40 Date: Tue,  6 Mar 2012 18:26:57 +0000\r
  41 Message-Id: <1331058417-13776-1-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.7.3\r
  43 In-Reply-To: <87d38w2e7h.fsf@zancas.localnet>\r
  44 References: <87d38w2e7h.fsf@zancas.localnet>\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrvsjLMzfYN5hRovrN2cyOzB6PFt1\r
  47         izmAMYrLJiU1J7MstUjfLoErY9OC3WwFOzgqOnf3Mjcw3mTrYuTkkBAwkXi77zojhC0mceHe\r
  48         eqA4F4eQwD5GidUzVrJAOOsZJW483c0I4Rxkkjg87TUzhDOfUWLrn3tg/WwCGhLb9i8Hs0UE\r
  49         pCV23p3N2sXIwcEsoCbxp0sFJCwsYCBxa90DFhCbRUBV4u7yXewgNq+Ag8T3v/uZIM5QkDi3\r
  50         +hxYnFNAV+Lo5MnMILaQgI5E55dXrBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszLSy3SNdHL\r
  51         zSzRS00p3cQIChtOSf4djN8OKh1iFOBgVOLhrdIN8xdiTSwrrsw9xCjJwaQkyjsvGCjEl5Sf\r
  52         UpmRWJwRX1Sak1p8iFGCg1lJhPfb+1B/Id6UxMqq1KJ8mJQ0B4uSOK+a1js/IYH0xJLU7NTU\r
  53         gtQimKwMB4eSBK8NMD6EBItS01Mr0jJzShDSTBycIMN5gIa7gtTwFhck5hZnpkPkTzEqSonz\r
  54         eoIkBEASGaV5cL2wuH7FKA70ijBvAEgVDzAlwHW/AhrMBDS4TTkYZHBJIkJKqoFxUU7kvf4V\r
  55         TqL1X9QLY36HL1NmsmPtM2NIsL8Rv+kMT+L/cCfzVabv/5VGrK5mVtyycrv+lPavHV7+a3rv\r
  56         1LBd/HBZ3G+yduBjI/5jMy+VvC49dv6eTXeJcIbrGSYL49o7H6eZldw1zWW3/vMxa+5SZ+Pm\r
  57         voWqFdVTbjKxmC4X13Ezna0rtEyJpTgj0VCLuag4EQAny6hCxgIAAA==\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Tue, 06 Mar 2012 18:27:05 -0000\r
  71 \r
  72 ---\r
  73  mime-node.c |   15 +++++++++++++++\r
  74  1 files changed, 15 insertions(+), 0 deletions(-)\r
  75 \r
  76 diff --git a/mime-node.c b/mime-node.c\r
  77 index d6b4506..a95bdab 100644\r
  78 --- a/mime-node.c\r
  79 +++ b/mime-node.c\r
  80 @@ -97,11 +97,26 @@ mime_node_open (const void *ctx, notmuch_message_t *message,\r
  81      }\r
  82  \r
  83      mctx->stream = g_mime_stream_file_new (mctx->file);\r
  84 +    if (!mctx->stream) {\r
  85 +       fprintf (stderr, "Out of memory.\n");\r
  86 +       status = NOTMUCH_STATUS_OUT_OF_MEMORY;\r
  87 +       goto DONE;\r
  88 +    }\r
  89      g_mime_stream_file_set_owner (GMIME_STREAM_FILE (mctx->stream), FALSE);\r
  90  \r
  91      mctx->parser = g_mime_parser_new_with_stream (mctx->stream);\r
  92 +    if (!mctx->parser) {\r
  93 +       fprintf (stderr, "Out of memory.\n");\r
  94 +       status = NOTMUCH_STATUS_OUT_OF_MEMORY;\r
  95 +       goto DONE;\r
  96 +    }\r
  97  \r
  98      mctx->mime_message = g_mime_parser_construct_message (mctx->parser);\r
  99 +    if (!mctx->mime_message) {\r
 100 +       fprintf (stderr, "Failed to parse %s\n", filename);\r
 101 +       status = NOTMUCH_STATUS_FILE_ERROR;\r
 102 +       goto DONE;\r
 103 +    }\r
 104  \r
 105      mctx->cryptoctx = cryptoctx;\r
 106      mctx->decrypt = decrypt;\r
 107 -- \r
 108 1.7.7.3\r
 109 \r