From a2a735a098ea246f0d84f6da109e06c2202aecf2 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 8 Dec 2012 08:32:54 +0000 Subject: [PATCH] Re: [PATCH 06/10] emacs: Fix bug in resynchronizing after a JSON parse error --- d8/e2e3b8824e80466dac9b6bc950829c9d8d6de7 | 139 ++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 d8/e2e3b8824e80466dac9b6bc950829c9d8d6de7 diff --git a/d8/e2e3b8824e80466dac9b6bc950829c9d8d6de7 b/d8/e2e3b8824e80466dac9b6bc950829c9d8d6de7 new file mode 100644 index 000000000..a3654d938 --- /dev/null +++ b/d8/e2e3b8824e80466dac9b6bc950829c9d8d6de7 @@ -0,0 +1,139 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1AD28431FAF + for ; Sat, 8 Dec 2012 00:33:00 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id w4YQRmppe20X for ; + Sat, 8 Dec 2012 00:32:59 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 61E1A431FAE + for ; Sat, 8 Dec 2012 00:32:59 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1ThFq6-00012n-0a; Sat, 08 Dec 2012 08:32:52 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1ThFq5-00042x-LV; Sat, 08 Dec 2012 08:32:49 +0000 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 06/10] emacs: Fix bug in resynchronizing after a JSON + parse error +In-Reply-To: <1354416002-3557-6-git-send-email-amdragon@mit.edu> +References: <1354416002-3557-1-git-send-email-amdragon@mit.edu> + <1354416002-3557-6-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 08 Dec 2012 08:32:54 +0000 +Message-ID: <87hanxgczt.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: b283158dbaca1a42c912bb279161aa4a (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 08 Dec 2012 08:33:00 -0000 + + +This patch looks good to me. Should it go in ahead of the rest of the +series as it essentially a bugfix? + +Best wishes + +Mark + +On Sun, 02 Dec 2012, Austin Clements wrote: +> Previously, if the input stream consisted only of an error message, +> notmuch-json-begin-compound would signal a (wrong-type-argument +> number-or-marker-p nil) error when reaching the end of the error +> message. This happened because notmuch-json-scan-to-value would think +> that it reached a value and put the parser into the 'value state. +> Even after notmuch-json-begin-compound signaled the syntax error, the +> parser would remain in this state and when the resynchronization logic +> reached the end of the buffer, the parser would fail because the +> 'value state indicates that characters are available. +> +> This fixes this problem by restoring the parser's previous state if it +> encounters a syntax error. +> --- +> emacs/notmuch-lib.el | 22 +++++++++++++--------- +> 1 file changed, 13 insertions(+), 9 deletions(-) +> +> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +> index 1d0ec17..9402456 100644 +> --- a/emacs/notmuch-lib.el +> +++ b/emacs/notmuch-lib.el +> @@ -474,15 +474,19 @@ Entering JSON objects is currently unimplemented." +> (with-current-buffer (notmuch-json-buffer jp) +> ;; Disallow terminators +> (setf (notmuch-json-allow-term jp) nil) +> - (or (notmuch-json-scan-to-value jp) +> - (if (/= (char-after) ?\[) +> - (signal 'json-readtable-error (list "expected '['")) +> - (forward-char) +> - (push ?\] (notmuch-json-term-stack jp)) +> - ;; Expect a value or terminator next +> - (setf (notmuch-json-next jp) 'expect-value +> - (notmuch-json-allow-term jp) t) +> - t)))) +> + ;; Save "next" so we can restore it if there's a syntax error +> + (let ((saved-next (notmuch-json-next jp))) +> + (or (notmuch-json-scan-to-value jp) +> + (if (/= (char-after) ?\[) +> + (progn +> + (setf (notmuch-json-next jp) saved-next) +> + (signal 'json-readtable-error (list "expected '['"))) +> + (forward-char) +> + (push ?\] (notmuch-json-term-stack jp)) +> + ;; Expect a value or terminator next +> + (setf (notmuch-json-next jp) 'expect-value +> + (notmuch-json-allow-term jp) t) +> + t))))) +> +> (defun notmuch-json-read (jp) +> "Parse the value at point in JP's buffer. +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2