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

Fix PR cli/23785: Check if file exists when invoking "restore FILE binary"

Browse Source 
This simple patch fixes the segfault reported on PR cli/23785, which
happens when using the "restore FILE binary" command with a
non-existent file.  We just have to check if the file handler returned
by "gdb_fopen_cloexec" is not NULL, and error out if it is.

A test has also been added to gdb.base/restore.exp in order to
exercise this scenario.

No regressions introduced.

gdb/ChangeLog:
2018-10-18  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR cli/23785
	* cli/cli-dump.c (restore_binary_file): Check if "file" is
	NULL.

gdb/testsuite/ChangeLog:
2018-10-18  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR cli/23785
	* gdb.base/restore.exp: New test to check if "restore" with an
	invalid file doesn't segfault.
This commit is contained in:
Sergio Durigan Junior 2018-10-18 12:56:25 -04:00
parent f63085d15f
commit 94c18618a8
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2018-10-18 Sergio Durigan Junior <sergiodj@redhat.com>
PR cli/23785
* cli/cli-dump.c (restore_binary_file): Check if "file" is
NULL.
2018-10-17 Paul Koning <paul_koning@dell.com>
* charset.c (convert_between_encodings): Fix unsigned overflow.

3
gdb/cli/cli-dump.c
View File

@ -468,6 +468,9 @@ restore_binary_file (const char *filename, struct callback_data *data)
gdb_file_up file = gdb_fopen_cloexec (filename, FOPEN_RB);
long len;
if (file == NULL)
error (_("Failed to open %s: %s"), filename, safe_strerror (errno));
/* Get the file size for reading. */
if (fseek (file.get (), 0, SEEK_END) == 0)
{

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2018-10-18 Sergio Durigan Junior <sergiodj@redhat.com>
PR cli/23785
* gdb.base/restore.exp: New test to check if "restore" with an
invalid file doesn't segfault.
2018-10-18 Tom de Vries <tdevries@suse.de>
* gdb.ada/bp_inlined_func.exp: Fix capitalized test name.

8
gdb/testsuite/gdb.base/restore.exp
View File

@ -86,3 +86,11 @@ set prev_timeout $timeout
set timeout 30
restore_tests
set timeout $prev_timeout
# Test PR cli/23785
clean_restart $binfile
if { ![runto_main] } {
return -1
}
gdb_test "restore non-existent-file binary" \
"Failed to open non-existent-file: .*"