Fix a crash in jit.c

A user at Mozilla pointed out a crash in jit.c.  In his situation, an
inferior using the JIT API exec'd an executable that did not use it.
This caused an assertion failure when jit.c:free_objfile_data called
delete_breakpoint with NULL.

This patch fixes the problem in the obvious way.  New test case
included.

gdb/ChangeLog
2018-12-28  Tom Tromey  <tom@tromey.com>

	* jit.c (free_objfile_data): Only delete breakpoint if non-null.

gdb/testsuite/ChangeLog
2018-12-28  Tom Tromey  <tom@tromey.com>
	    Simon Marchi <simark@simark.ca>

	* gdb.base/jit-exec.exp: New file.
	* gdb.base/jit-exec.c: New file.
	* gdb.base/jit-execd.c: New file.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2c9f8747729f24db83a4050fcd1614690c5a52c..d14a09373df0c8cc59ca11c9e50ed5742e58f45a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-28  Tom Tromey  <tom@tromey.com>
+
+       * jit.c (free_objfile_data): Only delete breakpoint if non-null.
+
 2018-12-28  Tom Tromey  <tom@tromey.com>
 
        * NEWS: Mention terminal styling.

diff --git a/gdb/jit.c b/gdb/jit.c
index e6b3cc25ca42c0accae6b8ef0adb9d24345ed209..9ae5d4a908c63d2f458ce16148e317830e7a7494 100644 (file)
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -1464,7 +1464,8 @@ free_objfile_data (struct objfile *objfile, void *data)
       if (ps_data != NULL && ps_data->objfile == objfile)
        {
          ps_data->objfile = NULL;
-         delete_breakpoint (ps_data->jit_breakpoint);
+         if (ps_data->jit_breakpoint != NULL)
+           delete_breakpoint (ps_data->jit_breakpoint);
          ps_data->cached_code_address = 0;
        }
     }

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b846b0c7af60c5c741e5a2e3daf946b9e9603eee..3da846fcabccacac0be74f1e98a033f3ae5e4c62 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-12-28  Tom Tromey  <tom@tromey.com>
+           Simon Marchi <simark@simark.ca>
+
+       * gdb.base/jit-exec.exp: New file.
+       * gdb.base/jit-exec.c: New file.
+       * gdb.base/jit-execd.c: New file.
+
 2018-12-28  Tom Tromey  <tom@tromey.com>
 
        * gdb.base/style.exp: Update test to check for address styling.

diff --git a/gdb/testsuite/gdb.base/jit-exec.c b/gdb/testsuite/gdb.base/jit-exec.c
new file mode 100644 (file)
index 0000000..85b5334
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jit-exec.c
@@ -0,0 +1,28 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2018 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Simple standalone program using the JIT API.  */
+
+#include "jit-simple-jit.c"
+#include <unistd.h>
+
+int
+main (int argc, char **argv)
+{
+  execl (PROGRAM, PROGRAM, (char *) 0);
+  return 99;
+}

diff --git a/gdb/testsuite/gdb.base/jit-exec.exp b/gdb/testsuite/gdb.base/jit-exec.exp
new file mode 100644 (file)
index 0000000..9dbf53c
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jit-exec.exp
@@ -0,0 +1,52 @@
+# Copyright 2018 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for a jit.c bug.  Previously it would crash if an
+# inferior that used the JIT API then exec'd a program that did not
+# use it.
+
+if { ![istarget "*-linux*"] } then {
+    return
+}
+
+standard_testfile jit-exec.c
+
+set testfile2 "jit-execd"
+set srcfile2 ${testfile2}.c
+set binfile2 [standard_output_file ${testfile2}]
+
+set compile_options [list debug additional_flags=-DPROGRAM=\"$binfile2\"]
+
+if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
+        executable $compile_options] != ""} {
+    untested "failed to compile"
+    return -1
+}
+
+if {[gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" \
+        executable $compile_options] != ""} {
+    untested "failed to compile"
+    return -1
+}
+
+clean_restart $binfile
+
+if {![runto_main]} {
+    fail "can't run to main"
+    return
+}
+
+delete_breakpoints
+gdb_test "continue" "Inferior .* exited normally.*"

diff --git a/gdb/testsuite/gdb.base/jit-execd.c b/gdb/testsuite/gdb.base/jit-execd.c
new file mode 100644 (file)
index 0000000..6afe539
--- /dev/null
+++ b/gdb/testsuite/gdb.base/jit-execd.c
@@ -0,0 +1,22 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2018 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+int
+main (int argc, char **argv)
+{
+  return 0;
+}