OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid potencially-stale errno usage. 

The current throw_perror_with_name/TARGET_CLOSE_ERROR calls assume
errno is still set to the right error, although remote_unpush_target
is called in between, which may well change errno.

Tested on x86_64 Fedora 17 w/ gdbserver.

gdb/
2013-04-09  Pedro Alves  <palves@redhat.com>

	* remote.c (unpush_and_perror): New function.
	(readchar, remote_serial_write): Use it.
This commit is contained in:
Pedro Alves 2013-04-09 12:18:34 +00:00
parent 16d02dc907
commit 1927e61863
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2013-04-09 Pedro Alves <palves@redhat.com>
* remote.c (unpush_and_perror): New function.
(readchar, remote_serial_write): Use it.
2013-04-09 Markus Metzger <markus.t.metzger@intel.com> 2013-04-09 Markus Metzger <markus.t.metzger@intel.com>
* NEWS: Mention new btrace RSP packets. * NEWS: Mention new btrace RSP packets.

29
gdb/remote.c
View File

@ -7033,6 +7033,23 @@ remote_files_info (struct target_ops *ignore)
/* Stuff for dealing with the packets which are part of this protocol. /* Stuff for dealing with the packets which are part of this protocol.
See comment at top of file for details. */ See comment at top of file for details. */
/* Close/unpush the remote target, and throw a TARGET_CLOSE_ERROR
error to higher layers. Called when a serial error is detected.
The exception message is STRING, followed by a colon and a blank,
then the system error message for errno at function entry. */
static void
unpush_and_perror (const char *string)
{
char *errstr;
errstr = xstrprintf ("%s: %s", string, safe_strerror (errno));
make_cleanup (xfree, errstr);
remote_unpush_target ();
throw_error (TARGET_CLOSE_ERROR, "%s", errstr);
}
/* Read a single character from the remote end. */ /* Read a single character from the remote end. */
static int static int
@ -7052,10 +7069,8 @@ readchar (int timeout)
throw_error (TARGET_CLOSE_ERROR, _("Remote connection closed")); throw_error (TARGET_CLOSE_ERROR, _("Remote connection closed"));
/* no return */ /* no return */
case SERIAL_ERROR: case SERIAL_ERROR:
remote_unpush_target (); unpush_and_perror (_("Remote communication error. "
throw_perror_with_name (TARGET_CLOSE_ERROR, "Target disconnected."));
_("Remote communication error. "
"Target disconnected."));
/* no return */ /* no return */
case SERIAL_TIMEOUT: case SERIAL_TIMEOUT:
break; break;
@ -7071,10 +7086,8 @@ remote_serial_write (const char *str, int len)
{ {
if (serial_write (remote_desc, str, len)) if (serial_write (remote_desc, str, len))
{ {
remote_unpush_target (); unpush_and_perror (_("Remote communication error. "
throw_perror_with_name (TARGET_CLOSE_ERROR, "Target disconnected."));
_("Remote communication error. "
"Target disconnected."));
} }
} }