--- /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 1AD28431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 8 Dec 2012 00:33:00 -0800 (PST)\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 w4YQRmppe20X for <notmuch@notmuchmail.org>;\r
+ Sat, 8 Dec 2012 00:32:59 -0800 (PST)\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 61E1A431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 8 Dec 2012 00:32:59 -0800 (PST)\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 1ThFq6-00012n-0a; Sat, 08 Dec 2012 08:32:52 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] 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 1ThFq5-00042x-LV; Sat, 08 Dec 2012 08:32:49 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 06/10] emacs: Fix bug in resynchronizing after a JSON\r
+ parse error\r
+In-Reply-To: <1354416002-3557-6-git-send-email-amdragon@mit.edu>\r
+References: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+ <1354416002-3557-6-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 08 Dec 2012 08:32:54 +0000\r
+Message-ID: <87hanxgczt.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: b283158dbaca1a42c912bb279161aa4a (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.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: Sat, 08 Dec 2012 08:33:00 -0000\r
+\r
+\r
+This patch looks good to me. Should it go in ahead of the rest of the\r
+series as it essentially a bugfix?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Sun, 02 Dec 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Previously, if the input stream consisted only of an error message,\r
+> notmuch-json-begin-compound would signal a (wrong-type-argument\r
+> number-or-marker-p nil) error when reaching the end of the error\r
+> message. This happened because notmuch-json-scan-to-value would think\r
+> that it reached a value and put the parser into the 'value state.\r
+> Even after notmuch-json-begin-compound signaled the syntax error, the\r
+> parser would remain in this state and when the resynchronization logic\r
+> reached the end of the buffer, the parser would fail because the\r
+> 'value state indicates that characters are available.\r
+>\r
+> This fixes this problem by restoring the parser's previous state if it\r
+> encounters a syntax error.\r
+> ---\r
+> emacs/notmuch-lib.el | 22 +++++++++++++---------\r
+> 1 file changed, 13 insertions(+), 9 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 1d0ec17..9402456 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -474,15 +474,19 @@ Entering JSON objects is currently unimplemented."\r
+> (with-current-buffer (notmuch-json-buffer jp)\r
+> ;; Disallow terminators\r
+> (setf (notmuch-json-allow-term jp) nil)\r
+> - (or (notmuch-json-scan-to-value jp)\r
+> - (if (/= (char-after) ?\[)\r
+> - (signal 'json-readtable-error (list "expected '['"))\r
+> - (forward-char)\r
+> - (push ?\] (notmuch-json-term-stack jp))\r
+> - ;; Expect a value or terminator next\r
+> - (setf (notmuch-json-next jp) 'expect-value\r
+> - (notmuch-json-allow-term jp) t)\r
+> - t))))\r
+> + ;; Save "next" so we can restore it if there's a syntax error\r
+> + (let ((saved-next (notmuch-json-next jp)))\r
+> + (or (notmuch-json-scan-to-value jp)\r
+> + (if (/= (char-after) ?\[)\r
+> + (progn\r
+> + (setf (notmuch-json-next jp) saved-next)\r
+> + (signal 'json-readtable-error (list "expected '['")))\r
+> + (forward-char)\r
+> + (push ?\] (notmuch-json-term-stack jp))\r
+> + ;; Expect a value or terminator next\r
+> + (setf (notmuch-json-next jp) 'expect-value\r
+> + (notmuch-json-allow-term jp) t)\r
+> + t)))))\r
+> \r
+> (defun notmuch-json-read (jp)\r
+> "Parse the value at point in JP's buffer.\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff