From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Edmondson Newsgroups: gmane.emacs.bugs Subject: bug#19034: [PATCH v1] Fix errors generated when multiple IRC clients talk to a single IRC proxy. Date: Thu, 13 Nov 2014 06:19:07 +0000 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415859628 20724 80.91.229.3 (13 Nov 2014 06:20:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 06:20:28 +0000 (UTC) To: 19034@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 13 07:20:21 2014 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 1XonlT-0001VE-Qr for geb-bug-gnu-emacs@m.gmane.org; Thu, 13 Nov 2014 07:20:19 +0100 Original-Received: from localhost ([::1]:57975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XonlT-0006Qr-0P for geb-bug-gnu-emacs@m.gmane.org; Thu, 13 Nov 2014 01:20:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XonlJ-0006QK-Gn for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 01:20:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XonlD-0006Fn-70 for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 01:20:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XonlD-0006F5-3q for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 01:20:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XonlC-0005N1-Jj for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 01:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: David Edmondson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Nov 2014 06:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19034 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19034-submit@debbugs.gnu.org id=B19034.141585955520567 (code B ref 19034); Thu, 13 Nov 2014 06:20:02 +0000 Original-Received: (at 19034) by debbugs.gnu.org; 13 Nov 2014 06:19:15 +0000 Original-Received: from localhost ([127.0.0.1]:59013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XonkQ-0005Le-Nr for submit@debbugs.gnu.org; Thu, 13 Nov 2014 01:19:15 -0500 Original-Received: from mail-wg0-f43.google.com ([74.125.82.43]:35838) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XonkN-0005LV-3M for 19034@debbugs.gnu.org; Thu, 13 Nov 2014 01:19:12 -0500 Original-Received: by mail-wg0-f43.google.com with SMTP id y10so16204071wgg.2 for <19034@debbugs.gnu.org>; Wed, 12 Nov 2014 22:19:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:user-agent:to:subject:references:from:date :in-reply-to:message-id:mime-version:content-type; bh=KwItcOZtiDe/Ze7KC7vB/zqz7eR+qmwQveIvhXFX7jQ=; b=BfqmZjHGMFYK5vNx+kNmFbqhgPlBiNy9lWHp/DgSc0h81+sTir2o0q67KXYlw63DCt xfxQz1oKpMbmuXwPFugBQ7JX02taIXEKQupQXxZOTYd2tUOQm7AyJNldeNU+hhLN15Rq f1BlqjkIZJeaW/cAD8IZM9/rsnHw9wzXwW5txjG60Nm1IbGLVZfrg8dHE6GN3Kg2JLIB P8rsCb0KUIEck4z14g0q4XuVNQBd03yY0U8Ka04F5mx/5Arp1NDMXTWC91UUDphuMuI7 kLdzly2fPb4bAIs2lI6h90wmWTZJY4oENXBxdAe/Bc2+V/DiULECkX3yNQHqhWLglQhM J+tw== X-Gm-Message-State: ALoCoQkAwx/sPVGhp8vwSDTj+EQkKh73OTttV/3mHYUca7OHZNXoI1HZeAb1fMaSu/x00QcQScjE X-Received: by 10.194.90.244 with SMTP id bz20mr465366wjb.125.1415859550137; Wed, 12 Nov 2014 22:19:10 -0800 (PST) Original-Received: from disaster-area.hh.sledj.net ([2a01:348:1a2:1:ea39:35ff:fe2c:a227]) by mx.google.com with ESMTPSA id gc7sm34168291wjb.16.2014.11.12.22.19.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2014 22:19:09 -0800 (PST) Original-Received: from localhost (30000@localhost [local]); by localhost (OpenSMTPD) with ESMTPA id c74cd2f2; Thu, 13 Nov 2014 06:19:07 +0000 (UTC) User-Agent: OpenSMTPD enqueuer (Demoostik) In-Reply-To: (David Edmondson's message of "Wed, 12 Nov 2014 20:14:48 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95914 If multiple IRC clients are connected to a single IRC proxy, an instance of erc can receive the response to a NAMES request issued by another client. Given that this instance of erc didn't initiate the NAMES request, `erc-channel-begin-receiving-names' will not have been called and `erc-channel-new-member-names' will be nil. To avoid this causing problems, initialise `erc-channel-new-member-names' by calling `erc-channel-begin-receiving-names' if it is nil. --- Michael Olson asked me to send this to emacs-devel after I had posted it to erc-discuss. I'm not subscribed to the list - please include me directly in any replies. erc.el | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/erc.el b/erc.el index 6e37f36..320cc02 100644 --- a/erc.el +++ b/erc.el @@ -4539,11 +4539,12 @@ received. Should be called with the current buffer set to the channel buffer. See also `erc-channel-begin-receiving-names'." - (maphash (lambda (nick user) - (if (null (gethash nick erc-channel-new-member-names)) - (erc-remove-channel-user nick))) - erc-channel-users) - (setq erc-channel-new-member-names nil)) + (when erc-channel-new-member-names + (maphash (lambda (nick user) + (if (null (gethash nick erc-channel-new-member-names)) + (erc-remove-channel-user nick))) + erc-channel-users) + (setq erc-channel-new-member-names nil))) (defun erc-parse-prefix () "Return an alist of valid prefix character types and their representations. @@ -4600,6 +4601,11 @@ channel." op 'off voice 'off)) (when updatep + ;; If we didn't issue the NAMES request (consider two clients + ;; talking to an IRC proxy), `erc-channel-begin-receiving-names' + ;; will not have been called, so we have to do it here. + (unless erc-channel-new-member-names + (erc-channel-begin-receiving-names)) (puthash (erc-downcase name) t erc-channel-new-member-names) (erc-update-current-channel-member -- 2.1.0