From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: emacs-26 c87d04e: Avoid aborts in 'md5' Date: Wed, 28 Feb 2018 11:14:36 -0800 Organization: UCLA Computer Science Department Message-ID: <2ec62b62-7d0e-c0a5-6139-739f9b5a4206@cs.ucla.edu> References: <20180227164448.16622.42058@vcs0.savannah.gnu.org> <20180227164448.E4B45207B1@vcs0.savannah.gnu.org> <87h8q15xdo.fsf@gmx.de> <87606h5vlm.fsf@gmx.de> <83inahyuq9.fsf@gnu.org> <83606hyqlw.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------A1D4E107577DD2976F463E83" X-Trace: blaine.gmane.org 1519845202 14054 195.159.176.226 (28 Feb 2018 19:13:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Feb 2018 19:13:22 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 Cc: michael.albinus@gmx.de, emacs-devel@gnu.org To: Eli Zaretskii , Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 28 20:13:17 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er7AD-0003A4-3s for ged-emacs-devel@m.gmane.org; Wed, 28 Feb 2018 20:13:17 +0100 Original-Received: from localhost ([::1]:46324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er7CF-0004IM-IZ for ged-emacs-devel@m.gmane.org; Wed, 28 Feb 2018 14:15:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er7Be-0004IB-4I for emacs-devel@gnu.org; Wed, 28 Feb 2018 14:14:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er7Bd-0005t7-0q for emacs-devel@gnu.org; Wed, 28 Feb 2018 14:14:46 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:53000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1er7BX-0005pb-GK; Wed, 28 Feb 2018 14:14:39 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 9145C1615F2; Wed, 28 Feb 2018 11:14:37 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id DgzqKGeVBsKN; Wed, 28 Feb 2018 11:14:36 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 5B2C31615FB; Wed, 28 Feb 2018 11:14:36 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hJWlE82P2taa; Wed, 28 Feb 2018 11:14:36 -0800 (PST) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 3B8F21615F2; Wed, 28 Feb 2018 11:14:36 -0800 (PST) In-Reply-To: <83606hyqlw.fsf@gnu.org> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:223180 Archived-At: This is a multi-part message in MIME format. --------------A1D4E107577DD2976F463E83 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 02/28/2018 09:24 AM, Eli Zaretskii wrote: > With the current code, I agree. OK, proposed patch attached. --------------A1D4E107577DD2976F463E83 Content-Type: text/x-patch; name="0001-Avoid-unnecessary-STRINGP-test-in-recent-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Avoid-unnecessary-STRINGP-test-in-recent-fix.patch" >From 1858a2c261f61cff1c62b9238dfb29a3eba5ecfa Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 28 Feb 2018 11:13:31 -0800 Subject: [PATCH] Avoid unnecessary STRINGP test in recent fix Problem noted by Andreas Schwab in: https://lists.gnu.org/r/emacs-devel/2018-02/msg00854.html * src/fns.c (Fsecure_hash_algorithms): Simplify previous change. --- src/fns.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/fns.c b/src/fns.c index de1dad3736..0a458ff45a 100644 --- a/src/fns.c +++ b/src/fns.c @@ -4951,8 +4951,7 @@ extract_data_from_object (Lisp_Object spec, error ("GnuTLS is not available, so `iv-auto' can't be used"); #endif } - - if (!STRINGP (object)) + else signal_error ("Invalid object argument", NILP (object) ? build_string ("nil") : object); return SSDATA (object); -- 2.14.3 --------------A1D4E107577DD2976F463E83--