From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Newsgroups: gmane.emacs.bugs Subject: bug#54263: 29.0.50; color-values-from-color-spec accepts whitespace in rgbi: specifications Date: Sun, 6 Mar 2022 12:23:46 +0100 Message-ID: <6E51015D-D59B-4120-8411-86F0909B4BDD@acm.org> References: <875yore4vb.fsf@posteo.net> <832485F0-60AE-48E6-B163-0DF031F31028@acm.org> Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_9369F558-96E4-4642-AE16-B08D2CBB4C9C" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20476"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 54263@debbugs.gnu.org, Philip Kaludercic , Lars Ingebrigtsen To: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Mar 06 12:26:12 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nQp1f-00055L-HY for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 06 Mar 2022 12:26:11 +0100 Original-Received: from localhost ([::1]:57342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQp1e-00066m-L1 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 06 Mar 2022 06:26:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:57354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQp0j-00064z-QX for bug-gnu-emacs@gnu.org; Sun, 06 Mar 2022 06:25:15 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQp0Y-0002Y0-Om for bug-gnu-emacs@gnu.org; Sun, 06 Mar 2022 06:25:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQp0Y-00024y-Cr for bug-gnu-emacs@gnu.org; Sun, 06 Mar 2022 06:25:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 06 Mar 2022 11:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54263 X-GNU-PR-Package: emacs Original-Received: via spool by 54263-submit@debbugs.gnu.org id=B54263.16465658517902 (code B ref 54263); Sun, 06 Mar 2022 11:25:02 +0000 Original-Received: (at 54263) by debbugs.gnu.org; 6 Mar 2022 11:24:11 +0000 Original-Received: from localhost ([127.0.0.1]:49963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQozi-00023O-Sl for submit@debbugs.gnu.org; Sun, 06 Mar 2022 06:24:11 -0500 Original-Received: from mail1439c50.megamailservers.eu ([91.136.14.39]:34700 helo=mail264c50.megamailservers.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQozg-00022s-DH for 54263@debbugs.gnu.org; Sun, 06 Mar 2022 06:24:09 -0500 X-Authenticated-User: mattiase@bredband.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1646565828; bh=mom8yiFxAb37i+GFOcmk/j6zpyHKYKVWEbkp3sBIW6U=; h=From:Subject:Date:In-Reply-To:Cc:To:References:From; b=Z5Smu1GkdeIGbPP0BnslyZnC3y2vA5QjZIppSOUvtk9axhtkTtn/x+dd0AWw0KU7l 7RHOnhnAQWWXtBU1XU45BsI+QYmDfW9yS/1qDECmSugwbdieKPGDBFcO1XptU8p80y JyLz92Yzb40us8tvkNxQTnuWrowg/ddfDgWPQDEc= Feedback-ID: mattiase@acm.or Original-Received: from smtpclient.apple (c-b952e353.032-75-73746f71.bbcust.telenor.se [83.227.82.185]) (authenticated bits=0) by mail264c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id 226BNkB7019320; Sun, 6 Mar 2022 11:23:47 +0000 In-Reply-To: <832485F0-60AE-48E6-B163-0DF031F31028@acm.org> X-Mailer: Apple Mail (2.3654.120.0.1.13) X-CTCH-RefID: str=0001.0A742F1F.622499C4.003C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-Origin-Country: SE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:228059 Archived-At: --Apple-Mail=_9369F558-96E4-4642-AE16-B08D2CBB4C9C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii The previous patch erroneously accepted "rgbi:0/+0x0/0". Here is one = that doesn't try to be clever. Clear for emacs-28? --Apple-Mail=_9369F558-96E4-4642-AE16-B08D2CBB4C9C Content-Disposition: attachment; filename=0001-Don-t-accept-whitespace-or-hex-floats-in-rgbi-colour.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-Don-t-accept-whitespace-or-hex-floats-in-rgbi-colour.patch" Content-Transfer-Encoding: quoted-printable =46rom=20e7bc68ae2f8e78278280a11d0392f52226f50449=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20=3D?UTF-8?q?Mattias=3D20Engdeg=3DC3=3DA5rd?=3D=20= =0ADate:=20Sun,=206=20Mar=202022=2010:50:27=20+0100=0A= Subject:=20[PATCH]=20Don't=20accept=20whitespace=20or=20hex=20floats=20= in=20rgbi:=20colour=20specs=0A=0A`color-values-from-color-spec`=20(new=20= in=20Emacs=2028)=20erroneously=20accepted=0Aleading=20whitespace=20and=20= hex=20floats=20in=20rgbi:=20components.=0A=0AReported=20by=20Philip=20= Kaludercic.=0A=0A*=20src/xfaces.c=20(parse_float_color_comp):=20Disallow=20= leading=20whitespace=0Aand=20hex=20floats.=0A*=20= test/src/xfaces-tests.el=0A= (xfaces-internal-color-values-from-color-spec):=20Add=20test=20cases.=0A= ---=0A=20src/xfaces.c=20=20=20=20=20=20=20=20=20=20=20=20=20|=205=20= +++++=0A=20test/src/xfaces-tests.el=20|=205=20++++-=0A=202=20files=20= changed,=209=20insertions(+),=201=20deletion(-)=0A=0Adiff=20--git=20= a/src/xfaces.c=20b/src/xfaces.c=0Aindex=208100bdb157..1d2e2489de=20= 100644=0A---=20a/src/xfaces.c=0A+++=20b/src/xfaces.c=0A@@=20-888,6=20= +888,11=20@@=20parse_hex_color_comp=20(const=20char=20*s,=20const=20char=20= *e,=20unsigned=20short=20*dst)=0A=20static=20double=0A=20= parse_float_color_comp=20(const=20char=20*s,=20const=20char=20*e)=0A=20{=0A= +=20=20/*=20Only=20allow=20decimal=20float=20literals=20without=20= whitespace.=20=20*/=0A+=20=20for=20(const=20char=20*p=20=3D=20s;=20p=20<=20= e;=20p++)=0A+=20=20=20=20if=20(!((*p=20>=3D=20'0'=20&&=20*p=20<=3D=20= '9')=0A+=09=20=20||=20*p=20=3D=3D=20'.'=20||=20*p=20=3D=3D=20'+'=20||=20= *p=20=3D=3D=20'-'=20||=20*p=20=3D=3D=20'e'=20||=20*p=20=3D=3D=20'E'))=0A= +=20=20=20=20=20=20return=20-1;=0A=20=20=20char=20*end;=0A=20=20=20= double=20x=20=3D=20strtod=20(s,=20&end);=0A=20=20=20return=20(end=20=3D=3D= =20e=20&&=20x=20>=3D=200=20&&=20x=20<=3D=201)=20?=20x=20:=20-1;=0Adiff=20= --git=20a/test/src/xfaces-tests.el=20b/test/src/xfaces-tests.el=0Aindex=20= 31c0f021b2..16f1653791=20100644=0A---=20a/test/src/xfaces-tests.el=0A+++=20= b/test/src/xfaces-tests.el=0A@@=20-47,7=20+47,10=20@@=20= xfaces-internal-color-values-from-color-spec=0A=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20'(0=2032768=206554)))=0A=20=20=20(should=20= (equal=20(color-values-from-color-spec=20"rgbi:1e-3/1.0e-2/1e0")=0A=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20'(66=20655=2065535)))=0A= -=20=20(should=20(equal=20(color-values-from-color-spec=20= "rgbi:0/0.5/10")=20nil)))=0A+=20=20(should=20(equal=20= (color-values-from-color-spec=20"rgbi:0/0.5/10")=20nil))=0A+=20=20= (should=20(equal=20(color-values-from-color-spec=20"rgbi:0/0/=200")=20= nil))=0A+=20=20(should=20(equal=20(color-values-from-color-spec=20= "rgbi:0/0x0/0")=20nil))=0A+=20=20(should=20(equal=20= (color-values-from-color-spec=20"rgbi:0/+0x1/0")=20nil)))=0A=20=0A=20= (provide=20'xfaces-tests)=0A=20=0A--=20=0A2.32.0=20(Apple=20Git-132)=0A=0A= --Apple-Mail=_9369F558-96E4-4642-AE16-B08D2CBB4C9C--