From 1b40ec0559f4b24ccdf6b073610c526c4aa33c4d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 19 Sep 2015 17:45:47 -0600 Subject: [PATCH] Fix PR python/18984 This fixes PR python/18984. The bug is that gdbpy_solib_name uses GDB_PY_LL_ARG, whereas it should use GDB_PY_LLU_ARG to avoid overflow. Built and tested on x86-64 Fedora 23. 2016-06-02 Tom Tromey PR python/18984: * python/python.c (gdbpy_solib_name): Use GDB_PY_LLU_ARG. 2016-06-02 Tom Tromey PR python/18984: * gdb.python/py-shared.exp: Add solib_name test. --- gdb/ChangeLog | 5 +++++ gdb/python/python.c | 4 ++-- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.python/py-shared.exp | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 18261a785b..82d14b3e3c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-06-02 Tom Tromey + + PR python/18984: + * python/python.c (gdbpy_solib_name): Use GDB_PY_LLU_ARG. + 2016-06-01 Pedro Alves * remote-fileio.c (remote_fio_ctrl_c_flag, remote_fio_sa) diff --git a/gdb/python/python.c b/gdb/python/python.c index c706644245..1f1fece2ff 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -696,9 +696,9 @@ gdbpy_solib_name (PyObject *self, PyObject *args) { char *soname; PyObject *str_obj; - gdb_py_longest pc; + gdb_py_ulongest pc; - if (!PyArg_ParseTuple (args, GDB_PY_LL_ARG, &pc)) + if (!PyArg_ParseTuple (args, GDB_PY_LLU_ARG, &pc)) return NULL; soname = solib_name_from_address (current_program_space, pc); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 733dd3ca98..3b305a602b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-06-02 Tom Tromey + + PR python/18984: + * gdb.python/py-shared.exp: Add solib_name test. + 2016-06-02 Simon Marchi * gdb.mi/mi-memory-changed.exp: Fix filename passed to untested. diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp index 8673e542b4..4a0c73829d 100644 --- a/gdb/testsuite/gdb.python/py-shared.exp +++ b/gdb/testsuite/gdb.python/py-shared.exp @@ -66,3 +66,7 @@ gdb_test "python print (gdb.solib_name(long(func1)))" "py-shared-sl.sl" "test fu gdb_test "p &main" "" "main address" gdb_py_test_silent_cmd "python main = gdb.history(0)" "Aquire main address" 1 gdb_test "python print (gdb.solib_name(long(main)))" "None" "test main solib location" + +if {[is_lp64_target]} { + gdb_test "python print (len(\[gdb.solib_name(0xffffffffffffffff)\]))" "1" +}