Authentication-Results: mail-b.sr.ht; dkim=pass header.d=gmail.com header.i=@gmail.com Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mail-b.sr.ht (Postfix) with ESMTPS id 7F7C411EF78 for <~emersion/soju-dev@lists.sr.ht>; Sun, 5 Jun 2022 20:18:11 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id e11so11208385pfj.5 for <~emersion/soju-dev@lists.sr.ht>; Sun, 05 Jun 2022 13:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=V/9KHR+lw1ArAy+Y3fHURm96tc6BTJ3ncgsAGzoQI/A=; b=H2cZB8FgwouVhPG8d91IL6rSIEhpHmPkFDjXPyrp4OT1dl4sKPIqAwQ+3EudpaYY8D G7X5iDLeV1f4Y6bJqwVju8AmybylleGMqKUdRlSo4aQGcIIyTsNEdifAwF8fKRehMm5H tFCKdweMBwrKB5o4Ic4uBS+9V99nJxQ1qPrZeYRKVCsV7xzk35uMUiXcY7OXzPWWpdIw VnviQH5xKtXGWFxLa4R0SIE/7+/VfejsbE/rEoNMPZ5MGpH8+tioxcEMx6vcb2mYTkPb w9QPutQPoGqLVC2Ts3a6eHGfg+Su4+qsb/6M51YVtrdnAgQEVAXg2Yn4Air+gqiuVlMa +jSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=V/9KHR+lw1ArAy+Y3fHURm96tc6BTJ3ncgsAGzoQI/A=; b=jpKm5D+wTA5kP7PXrf1640oW9fBnT3yD5UfS7qNotXsSJE02ra1tMNzqR0D0CxdVTy MWcePRzYrwpXsk2p3GwiH5nPiZY9qthUsC1cE7sTVQquT9bIHW36tOdyofUKlnZgHVxP e8gSQnh5FLSNdLgIHdM0+MDpJXy+TBs7awt4tP6bGDhoVSZRhxx1Z5BSvH0olqFQx3+6 qVik1dJg94H7QTq8oewn1/9FqwtgmBZU4s76VrooXqcWcBczxKiBjwPmkiv05qQBoY/L CGB1rHYkHZihIZDsJ3LdL8f8RjmsKzpIHl1lsaZO6GRANH+GKvq0xj9tdoTc/wxGVt8k uDbg== X-Gm-Message-State: AOAM533S8gpC0OfPh0va2yc48yP7/U6bgeM+uA2a3N59Dj+s2DfL48wf nF3ZRqRoYwLkaguaBBXzMDSgraipHRoI+w== X-Google-Smtp-Source: ABdhPJzIiAFv+bI0NfmPO51EBgwMKjk01CGmXp5JBl3E3YOp173RIpSr9Z3sFS7dygUZ+SfllNdtaQ== X-Received: by 2002:aa7:93cc:0:b0:51b:f63b:6f74 with SMTP id y12-20020aa793cc000000b0051bf63b6f74mr8455279pff.66.1654460290178; Sun, 05 Jun 2022 13:18:10 -0700 (PDT) Received: from localhost.localdomain (97-115-99-87.ptld.qwest.net. [97.115.99.87]) by smtp.gmail.com with ESMTPSA id b82-20020a621b55000000b0051ba8b742e4sm9194129pfb.69.2022.06.05.13.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 13:18:09 -0700 (PDT) From: Jeff Martin To: ~emersion/soju-dev@lists.sr.ht Cc: Jeff Martin Subject: [PATCH] downstream: fix interface type panic for xirc.MembershipSet Date: Sun, 5 Jun 2022 13:18:06 -0700 Message-Id: <20220605201806.793424-1-jeffmartin@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- noticed this when deploying HEAD today downstream.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/downstream.go b/downstream.go index 26032eb..4992546 100644 --- a/downstream.go +++ b/downstream.go @@ -3331,8 +3331,8 @@ func sendNames(dc *downstreamConn, ch *upstreamChannel) { var members []string for _, entry := range ch.Members.innerMap { nick := entry.originalKey - memberships := entry.value.(*xirc.MembershipSet) - s := formatMemberPrefix(*memberships, dc) + dc.marshalEntity(ch.conn.network, nick) + memberships := entry.value.(xirc.MembershipSet) + s := formatMemberPrefix(memberships, dc) + dc.marshalEntity(ch.conn.network, nick) members = append(members, s) } -- 2.25.1