From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: emacs-26 c87d04e: Avoid aborts in 'md5' Date: Wed, 28 Feb 2018 10:15:04 +0100 Message-ID: References: <20180227164448.16622.42058@vcs0.savannah.gnu.org> <20180227164448.E4B45207B1@vcs0.savannah.gnu.org> <87h8q15xdo.fsf@gmx.de> <87606h5vlm.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1519809199 14116 195.159.176.226 (28 Feb 2018 09:13:19 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Feb 2018 09:13:19 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.91 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 28 10:13:15 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 1eqxnX-0003Db-6w for ged-emacs-devel@m.gmane.org; Wed, 28 Feb 2018 10:13:15 +0100 Original-Received: from localhost ([::1]:42971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqxpZ-0003Ca-M8 for ged-emacs-devel@m.gmane.org; Wed, 28 Feb 2018 04:15:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqxpS-0003C0-PR for emacs-devel@gnu.org; Wed, 28 Feb 2018 04:15:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqxpR-0000NY-Rm for emacs-devel@gnu.org; Wed, 28 Feb 2018 04:15:14 -0500 Original-Received: from mx2.suse.de ([195.135.220.15]:58549) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqxpJ-0000Hx-BP; Wed, 28 Feb 2018 04:15:05 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 541C0ABC9; Wed, 28 Feb 2018 09:15:04 +0000 (UTC) X-Yow: Where does it go when you flush? In-Reply-To: <87606h5vlm.fsf@gmx.de> (Michael Albinus's message of "Wed, 28 Feb 2018 10:09:25 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 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:223162 Archived-At: On Feb 28 2018, Michael Albinus wrote: > Andreas Schwab writes: > >> On Feb 28 2018, Michael Albinus wrote: >> >>> eliz@gnu.org (Eli Zaretskii) writes: >>> >>>> diff --git a/src/fns.c b/src/fns.c >>>> index aba34fd..de1dad3 100644 >>>> --- a/src/fns.c >>>> +++ b/src/fns.c >>>> @@ -4952,6 +4952,9 @@ extract_data_from_object (Lisp_Object spec, >>>> #endif >>>> } >>>> >>>> + if (!STRINGP (object)) >>>> + signal_error ("Invalid object argument", >>>> + NILP (object) ? build_string ("nil") : object); >>>> return SSDATA (object); >>>> } >>> >>> Don't we call CHECK_STRING (object) in such cases, which raises the >>> standardized error Qwrong_type_argument? >> >> How can that ever happen anyway? > > See bug#30627. So the CHECK_STRING should be put in the else branch. There is also a useless CHECK_BUFFER in the BUFFERP branch. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."