From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#24020: [PATCH] Fix =?UTF-8?Q?=E2=80=98is_?= =?UTF-8?Q?multibyte=E2=80=99?= test =?UTF-8?Q?regex.c=E2=80=99s?= mutually_exclusive_p (bug#24020) Date: Wed, 27 Jul 2016 18:22:17 +0200 Message-ID: <1469636537-17036-1-git-send-email-mina86@mina86.com> References: <1468850684-17867-1-git-send-email-mina86@mina86.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1469636650 17157 80.91.229.3 (27 Jul 2016 16:24:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Jul 2016 16:24:10 +0000 (UTC) To: 24020@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 27 18:24:02 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bSRcn-0001Nf-Lu for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jul 2016 18:24:01 +0200 Original-Received: from localhost ([::1]:47516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRcm-00062E-RL for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jul 2016 12:24:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRbu-0005Tj-FU for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:23:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSRbq-00037l-2F for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:23:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRbp-00037g-US for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:23:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bSRbp-0007Av-QZ for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:23:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <1468850684-17867-1-git-send-email-mina86@mina86.com> Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jul 2016 16:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24020 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24020-submit@debbugs.gnu.org id=B24020.146963655027525 (code B ref 24020); Wed, 27 Jul 2016 16:23:01 +0000 Original-Received: (at 24020) by debbugs.gnu.org; 27 Jul 2016 16:22:30 +0000 Original-Received: from localhost ([127.0.0.1]:39351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSRbJ-00079t-OD for submit@debbugs.gnu.org; Wed, 27 Jul 2016 12:22:29 -0400 Original-Received: from mail-wm0-f53.google.com ([74.125.82.53]:37632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSRbI-00079f-BV for 24020@debbugs.gnu.org; Wed, 27 Jul 2016 12:22:28 -0400 Original-Received: by mail-wm0-f53.google.com with SMTP id i5so70342176wmg.0 for <24020@debbugs.gnu.org>; Wed, 27 Jul 2016 09:22:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XrdpG488N4+Xkp13Ny5Q3NSGypRUHmzdrZoWJlLGa1Y=; b=UQz7MzDmacP98PoxIGM1ATp4wyBsiZvEms86QuG0Lpw8pPK2p/0vekTDYrRLIgR4bm Sn6W2lw47v+UTuEyP9esaTWPCIIy3//yDp55rlt8uCdLzUNfX/7l7pYXkf3zkTFEp31X LgcErEzDIWjVgneFDRG8IxxxxdLPk6cCVnTHgkhwphPVhSTjuxGhVIURX9T6SEJ67Xrw /xEovA7ZYpC5wAv88zeYQS1KFpRMotswg82LMebx10FK75v+l28ThEu4WEHoBpRTr8Ys 5o/W1X+pMbKvMrAtTk5QsplfjIyCYTzZOk0zBZakdX9WDLxd02rgAw3oa13EAVBZCJIF Tkag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=XrdpG488N4+Xkp13Ny5Q3NSGypRUHmzdrZoWJlLGa1Y=; b=AUMGkZ/VoykUoLuv6nRPm5FFKeiNAAbeZgqBth72iBGjUIJlOiDbRsuaPx8OcRsmaR 6HlhIXtRJ0bx1ASO0cA2Oc0AojupeiyaNX71UOMNeS5QUz0qHaYOB89+sqTZUur7PrVA KomXtebjZlaMQQ8fajHGuLax9nV2+iwoikYq97w0hNMePcU0VFtloUjQDfeLasvOEiRl AYE5kRMT4cdlLw1nh4ShxxMzM+PGXHnbqr9DjDfEBrj5Q+R9sdZKPkeoJD9OumNqJpY2 cJ4DXiL6NDmMhCn2BQVF3eGqQfbN206jG9tArY5vEuJqJeOxSkctkb8auG2TT9ko4Nmo HbkA== X-Gm-Message-State: ALyK8tLffoDEj/JpEyOfP9/NkOhbO1gnO37xjLqFa9GN52w8KMBU8g0u+OQdseB1RNaByqXb X-Received: by 10.28.54.229 with SMTP id y98mr51280903wmh.96.1469636542261; Wed, 27 Jul 2016 09:22:22 -0700 (PDT) Original-Received: from mpn.zrh.corp.google.com ([2620:0:105f:301:2815:7585:2e57:6c3b]) by smtp.gmail.com with ESMTPSA id f4sm39135730wmf.8.2016.07.27.09.22.20 for <24020@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jul 2016 09:22:20 -0700 (PDT) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id CC52C1E0268; Wed, 27 Jul 2016 18:22:19 +0200 (CEST) X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:121584 Archived-At: * src/regex.c (mutually_exclusive_p): Fix how whether character is unibyte is tested when calling execute_charset function. This bug has been introduced by [6dc6b00: Fix ‘[[:cc:]]*literal’ regex failing to match ‘literal’] which dropped a call to IS_REAL_ASCII (c) macro. Reinstitute it. --- src/regex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) FYI, I’ve just submitted this patch. The bug has been caught by tests from dima_regex_embedded_modifiers branch which I’m working on pulling into master branch so they will come in another commits. diff --git a/src/regex.c b/src/regex.c index 297bf71..1f2a1f08 100644 --- a/src/regex.c +++ b/src/regex.c @@ -4767,7 +4767,7 @@ mutually_exclusive_p (struct re_pattern_buffer *bufp, const_re_char *p1, else if ((re_opcode_t) *p1 == charset || (re_opcode_t) *p1 == charset_not) { - if (!execute_charset (&p1, c, c, !multibyte)) + if (!execute_charset (&p1, c, c, !multibyte || IS_REAL_ASCII (c))) { DEBUG_PRINT (" No match => fast loop.\n"); return 1; -- 2.8.0.rc3.226.g39d4020