* [patch] Fix internal error on library without dirname
@ 2010-07-20 21:45 Jan Kratochvil
2010-07-20 22:03 ` Tom Tromey
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kratochvil @ 2010-07-20 21:45 UTC (permalink / raw)
To: gdb-patches
Hi,
in some special cases ld.so can provide library name without any slash (/).
Starting program: [...]
../../gdb/symfile.c:1326: internal-error: find_separate_debug_file_by_debuglink: Assertion `i >= 0 && IS_DIR_SEPARATOR (dir[i])' failed.
A problem internal to GDB has been detected,
No regressions on {x86_64,x86_64-m32,i686}-fedora13-linux-gnu.
I believe it could go for 7.2.
I tried to step through find_separate_debug_file_by_debuglink in this case and
the code seems OK with DIR eq "".
Thanks,
Jan
gdb/
2010-07-20 Jan Kratochvil <jan.kratochvil@redhat.com>
* symfile.c (find_separate_debug_file_by_debuglink): Remove
a gdb_assert call, new comment.
gdb/testsuite/
2010-07-20 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.base/solib-nodir.exp: New file.
* lib/gdb.exp (runto): New case for a GDB internal error.
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1382,7 +1382,7 @@ find_separate_debug_file_by_debuglink (struct objfile *objfile)
if (IS_DIR_SEPARATOR (dir[i]))
break;
}
- gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
+ /* If I is -1 then no directory is present there and DIR will be "". */
dir[i+1] = '\0';
/* Set I to max (strlen (canon_name), strlen (dir)). */
--- /dev/null
+++ b/gdb/testsuite/gdb.base/solib-nodir.exp
@@ -0,0 +1,54 @@
+# Copyright 2010 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/>. */
+
+# are we on a target board
+if {![isnative] || [skip_shlib_tests]} {
+ return
+}
+
+set testfile "solib-nodir"
+# Arbitrary file, possibly not containing main, even an empty one.
+set srclibfile foo.c
+# Arbitrary file containing main.
+set srcfile start.c
+set binlibfilebase ${testfile}.so
+set binlibfiledir ${objdir}/${subdir}
+set binlibfile ${binlibfiledir}/${binlibfilebase}
+set executable ${testfile}
+set objfile ${objdir}/${subdir}/${executable}.o
+set binfile ${objdir}/${subdir}/${executable}
+
+# build the first test case
+if { [get_compiler_info unused]
+ || [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" [list debug additional_flags=-Wl,-soname,${binlibfilebase}]] != ""
+ || [gdb_gnu_strip_debug $binlibfile]
+ || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != ""
+ || [gdb_compile "${objfile} ${binlibfile}" "${binfile}" executable {}] != "" } {
+ untested ${testfile}.exp
+ return -1
+}
+
+clean_restart $executable
+gdb_load_shlibs ${binlibfile}
+
+gdb_test_no_output "set env LD_LIBRARY_PATH=:"
+gdb_test "cd ${binlibfiledir}" "Working directory [string_to_regexp ${binlibfiledir}]\\."
+
+set test "library loaded"
+if [runto_main] {
+ pass $test
+} else {
+ fail $test
+}
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -423,6 +423,11 @@ proc runto { function args } {
unsupported "Non-stop mode not supported"
return 0
}
+ -re ".*A problem internal to GDB has been detected" {
+ fail "running to $function in runto (GDB internal error)"
+ gdb_internal_error_resync
+ return 0
+ }
-re "$gdb_prompt $" {
fail "running to $function in runto"
return 0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] Fix internal error on library without dirname
2010-07-20 21:45 [patch] Fix internal error on library without dirname Jan Kratochvil
@ 2010-07-20 22:03 ` Tom Tromey
2010-07-20 22:24 ` Jan Kratochvil
0 siblings, 1 reply; 4+ messages in thread
From: Tom Tromey @ 2010-07-20 22:03 UTC (permalink / raw)
To: Jan Kratochvil; +Cc: gdb-patches
>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:
Jan> Starting program: [...]
Jan> ../../gdb/symfile.c:1326: internal-error: find_separate_debug_file_by_debuglink: Assertion `i >= 0 && IS_DIR_SEPARATOR (dir[i])' failed.
Jan> A problem internal to GDB has been detected,
Thanks.
Jan> I believe it could go for 7.2.
I agree.
Jan> * symfile.c (find_separate_debug_file_by_debuglink): Remove
Jan> a gdb_assert call, new comment.
There is a comment just before the loop above the assert that is now
invalid:
/* Strip off the final filename part, leaving the directory name,
followed by a slash. Objfile names should always be absolute and
tilde-expanded, so there should always be a slash in there
somewhere. */
This patch is ok with some suitable change to this comment.
Tom
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] Fix internal error on library without dirname
2010-07-20 22:03 ` Tom Tromey
@ 2010-07-20 22:24 ` Jan Kratochvil
2010-07-20 22:47 ` Tom Tromey
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kratochvil @ 2010-07-20 22:24 UTC (permalink / raw)
To: Tom Tromey; +Cc: gdb-patches
On Wed, 21 Jul 2010 00:03:35 +0200, Tom Tromey wrote:
> There is a comment just before the loop above the assert that is now
> invalid:
>
> /* Strip off the final filename part, leaving the directory name,
> followed by a slash. Objfile names should always be absolute and
> tilde-expanded, so there should always be a slash in there
> somewhere. */
>
> This patch is ok with some suitable change to this comment.
Used - hopefully OK:
/* Strip off the final filename part, leaving the directory name,
- followed by a slash. Objfile names should always be absolute and
- tilde-expanded, so there should always be a slash in there
- somewhere. */
+ followed by a slash. The directory can be relative or absolute. */
Checked-in:
http://sourceware.org/ml/gdb-cvs/2010-07/msg00118.html
Checked-in gdb_7_2-branch:
http://sourceware.org/ml/gdb-cvs/2010-07/msg00119.html
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2010-07/msg00118.html
--- src/gdb/ChangeLog 2010/07/20 12:54:57 1.12002
+++ src/gdb/ChangeLog 2010/07/20 22:19:06 1.12003
@@ -1,5 +1,10 @@
2010-07-20 Jan Kratochvil <jan.kratochvil@redhat.com>
+ * symfile.c (find_separate_debug_file_by_debuglink): Remove
+ a gdb_assert call, new comment.
+
+2010-07-20 Jan Kratochvil <jan.kratochvil@redhat.com>
+
* linux-nat.c (linux_handle_extended_wait): Handle case when
event == PTRACE_EVENT_CLONE && stopping && WSTOPSIG (status) != SIGSTOP.
--- src/gdb/symfile.c 2010/07/13 20:52:52 1.290
+++ src/gdb/symfile.c 2010/07/20 22:19:07 1.291
@@ -1374,15 +1374,13 @@
dir = xstrdup (objfile->name);
/* Strip off the final filename part, leaving the directory name,
- followed by a slash. Objfile names should always be absolute and
- tilde-expanded, so there should always be a slash in there
- somewhere. */
+ followed by a slash. The directory can be relative or absolute. */
for (i = strlen(dir) - 1; i >= 0; i--)
{
if (IS_DIR_SEPARATOR (dir[i]))
break;
}
- gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
+ /* If I is -1 then no directory is present there and DIR will be "". */
dir[i+1] = '\0';
/* Set I to max (strlen (canon_name), strlen (dir)). */
--- src/gdb/testsuite/ChangeLog 2010/07/20 22:06:59 1.2383
+++ src/gdb/testsuite/ChangeLog 2010/07/20 22:19:07 1.2384
@@ -1,4 +1,9 @@
2010-07-20 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.base/solib-nodir.exp: New file.
+ * lib/gdb.exp (runto): New case for a GDB internal error.
+
+2010-07-20 Jan Kratochvil <jan.kratochvil@redhat.com>
Ulrich Weigand <uweigand@de.ibm.com>
Tom Tromey <tromey@redhat.com>
--- src/gdb/testsuite/gdb.base/solib-nodir.exp
+++ src/gdb/testsuite/gdb.base/solib-nodir.exp 2010-07-20 22:23:49.482644000 +0000
@@ -0,0 +1,54 @@
+# Copyright 2010 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/>. */
+
+# are we on a target board
+if {![isnative] || [skip_shlib_tests]} {
+ return
+}
+
+set testfile "solib-nodir"
+# Arbitrary file, possibly not containing main, even an empty one.
+set srclibfile foo.c
+# Arbitrary file containing main.
+set srcfile start.c
+set binlibfilebase ${testfile}.so
+set binlibfiledir ${objdir}/${subdir}
+set binlibfile ${binlibfiledir}/${binlibfilebase}
+set executable ${testfile}
+set objfile ${objdir}/${subdir}/${executable}.o
+set binfile ${objdir}/${subdir}/${executable}
+
+# build the first test case
+if { [get_compiler_info unused]
+ || [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" [list debug additional_flags=-Wl,-soname,${binlibfilebase}]] != ""
+ || [gdb_gnu_strip_debug $binlibfile]
+ || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != ""
+ || [gdb_compile "${objfile} ${binlibfile}" "${binfile}" executable {}] != "" } {
+ untested ${testfile}.exp
+ return -1
+}
+
+clean_restart $executable
+gdb_load_shlibs ${binlibfile}
+
+gdb_test_no_output "set env LD_LIBRARY_PATH=:"
+gdb_test "cd ${binlibfiledir}" "Working directory [string_to_regexp ${binlibfiledir}]\\."
+
+set test "library loaded"
+if [runto_main] {
+ pass $test
+} else {
+ fail $test
+}
--- src/gdb/testsuite/lib/gdb.exp 2010/07/12 17:33:15 1.154
+++ src/gdb/testsuite/lib/gdb.exp 2010/07/20 22:19:07 1.155
@@ -423,6 +423,11 @@
unsupported "Non-stop mode not supported"
return 0
}
+ -re ".*A problem internal to GDB has been detected" {
+ fail "running to $function in runto (GDB internal error)"
+ gdb_internal_error_resync
+ return 0
+ }
-re "$gdb_prompt $" {
fail "running to $function in runto"
return 0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] Fix internal error on library without dirname
2010-07-20 22:24 ` Jan Kratochvil
@ 2010-07-20 22:47 ` Tom Tromey
0 siblings, 0 replies; 4+ messages in thread
From: Tom Tromey @ 2010-07-20 22:47 UTC (permalink / raw)
To: Jan Kratochvil; +Cc: gdb-patches
>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:
Jan> Used - hopefully OK:
Jan> /* Strip off the final filename part, leaving the directory name,
Jan> - followed by a slash. Objfile names should always be absolute and
Jan> - tilde-expanded, so there should always be a slash in there
Jan> - somewhere. */
Jan> + followed by a slash. The directory can be relative or absolute. */
Looks fine. Thanks again.
Tom
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-20 22:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-20 21:45 [patch] Fix internal error on library without dirname Jan Kratochvil
2010-07-20 22:03 ` Tom Tromey
2010-07-20 22:24 ` Jan Kratochvil
2010-07-20 22:47 ` Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).