Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 17:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up 0-length handling in gdbpy_create_lazy_string_object

Browse Source 
gdbpy_create_lazy_string_object will throw an exception if you pass it
a NULL pointer without also setting length=0 -- the default,
length==-1, will fail.  This seems bizarre.  Furthermore, it doesn't
make sense to do this check for array types, as an array can have a
zero length.  This patch cleans up the check and makes it specific to
TYPE_CODE_PTR.
This commit is contained in:
Tom Tromey
2024-11-19 07:34:26 -07:00
parent 2134b0b4a5
commit c286bfe1e5
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gdb/python/py-lazy-string.c
View File

@@ -182,14 +182,6 @@ gdbpy_create_lazy_string_object (CORE_ADDR address, long length,
return NULL;
}
if (address == 0 && length != 0)
{
PyErr_SetString (gdbpy_gdb_memory_error,
_("Cannot create a lazy string with address 0x0, " \
"and a non-zero length."));
return NULL;
}
if (!type)
{
PyErr_SetString (PyExc_RuntimeError,
@@ -216,6 +208,23 @@ gdbpy_create_lazy_string_object (CORE_ADDR address, long length,
}
break;
}
case TYPE_CODE_PTR:
if (address == 0)
{
if (length > 0)
{
PyErr_SetString (gdbpy_gdb_memory_error,
_("Cannot create a lazy string with address 0x0, " \
"and a non-zero length."));
return nullptr;
}
length = 0;
}
break;
default:
gdb_assert_not_reached ("invalid type in gdbpy_create_lazy_string_object");
}
str_obj = PyObject_New (lazy_string_object, &lazy_string_object_type);

2
gdb/testsuite/gdb.python/py-lazy-string.exp
View File

@@ -48,6 +48,8 @@ gdb_test "python print(null.lazy_string(length=3).value())" \
gdb_test "python print(null.lazy_string(length=-2))" \
"ValueError.*: Invalid length.*Error occurred in Python.*" \
"bad length"
gdb_py_test_silent_cmd "python nullstr = null.lazy_string()" \
"create null lazy string with default length" 1
foreach var_spec { { "ptr" "pointer" "const char \\*" -1 } \
{ "array" "array" "const char \\[6\\]" 6 } \