Re: emacs-26 c87d04e: Avoid aborts in 'md5'

[Andreas Schwab]

On Feb 28 2018, Michael Albinus <address@hidden> wrote:

> Andreas Schwab <address@hidden> writes:
>
>> On Feb 28 2018, Michael Albinus <address@hidden> wrote:
>>
>>> address@hidden (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, address@hidden
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."