Re: [PATCH v2] [gdb/remote] Fix abort on REMOTE_CLOSE_ERROR

[Tom de Vries <tdevries@suse.de>]

On 4/26/24 18:03, Pedro Alves wrote:
> On 2024-04-20 10:14, Tom de Vries wrote:
> 
>> +
>>   /* See gdb_bfd.h.  */
>>   
>>   gdb_bfd_ref_ptr
>> @@ -938,21 +961,48 @@ gdb_bfd_openr_iovec (const char *filename, const char *target,
>>     auto do_open = [] (bfd *nbfd, void *closure) -> void *
>>     {
>>       auto real_opener = static_cast<gdb_iovec_opener_ftype *> (closure);
>> -    return (*real_opener) (nbfd);
>> +    /* Prevent exceptions from escaping to C code and triggering an abort.  */
>> +    auto res = catch_exceptions<gdb_bfd_iovec_base *, nullptr> ([&] {
>> +      return (*real_opener) (nbfd);
>> +    });
> 
> Please use the lambda formatting described at:
> 
>    https://sourceware.org/gdb/wiki/Internals%20GDB-C-Coding-Standards#Indentation_of_lambdas_as_parameters
> 
> 
>> +    if (res == nullptr)
>> +      {
>> +	errno = EIO;
>> +	bfd_set_error (bfd_error_system_call);
>> +      }
>> +      return res;
>>     };
>>   
>>     auto read_trampoline = [] (bfd *nbfd, void *stream, void *buf,
>>   			     file_ptr nbytes, file_ptr offset) -> file_ptr
>>     {
>>       gdb_bfd_iovec_base *obj = static_cast<gdb_bfd_iovec_base *> (stream);
>> -    return obj->read (nbfd, buf, nbytes, offset);
>> +    /* Prevent exceptions from escaping to C code and triggering an abort.  */
>> +    auto res = catch_exceptions<long int, -1> ([&] {
>> +      return obj->read (nbfd, buf, nbytes, offset);
>> +    });
> 
> Ditto re. formatting.
> 
>> +    if (res == -1)
>> +      {
>> +	errno = EIO;
>> +	bfd_set_error (bfd_error_system_call);
>> +      }
>> +    return res;
>>     };
>>   
>>     auto stat_trampoline = [] (struct bfd *abfd, void *stream,
>>   			     struct stat *sb) -> int
>>     {
>>       gdb_bfd_iovec_base *obj = static_cast<gdb_bfd_iovec_base *> (stream);
>> -    return obj->stat (abfd, sb);
>> +    /* Prevent exceptions from escaping to C code and triggering an abort.  */
>> +    auto res = catch_exceptions<int, -1> ([&] {
>> +      return obj->stat (abfd, sb);
>> +    });
> 
> Ditto.
> 
>> +    if (res == -1)
>> +      {
>> +	errno = EIO;
>> +	bfd_set_error (bfd_error_system_call);
>> +      }
>> +    return res;
>>     };
>>   
>>     auto close_trampoline = [] (struct bfd *nbfd, void *stream) -> int
>>
>> base-commit: 20eee7540b9f2615f7661393756fec0bb62a1495
> 
> Otherwise:
> 
>    Approved-by: Pedro Alves <pedro@palves.net>

Hi Pedro,

thanks for the review.

Pushed with those changes.

Thanks,
- Tom


> 
> Thanks.
>