diff options
| -rw-r--r-- | gdb/python/py-lazy-string.c | 25 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-lazy-string.exp | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c index 30a171d..1226c28 100644 --- a/gdb/python/py-lazy-string.c +++ b/gdb/python/py-lazy-string.c @@ -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); diff --git a/gdb/testsuite/gdb.python/py-lazy-string.exp b/gdb/testsuite/gdb.python/py-lazy-string.exp index 0650c67..d212e61 100644 --- a/gdb/testsuite/gdb.python/py-lazy-string.exp +++ b/gdb/testsuite/gdb.python/py-lazy-string.exp @@ -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 } \ |