diff mbox series

Make pascal_language::print_type handle varstring==nullptr

Message ID 20240327164031.1582317-1-tom@tromey.com
State New
Headers
Series Make pascal_language::print_type handle varstring==nullptr |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed

Commit Message

Tom Tromey March 27, 2024, 4:40 p.m. UTC 
  PR gdb/31524 points out a crash when pascal_language::print_type is
called with varstring==nullptr.  This crash is a regression arising
from the printf/pager rewrite -- that indirectly removed a NULL check
from gdb's "puts".

This patch instead fixes the problem by adding a check to print_type.
Passing nullptr here seems to be expected in other places (e.g., there
is a call to type_print like this in expprint.c), and other
implementations of this method (or related helpers) explicitly check
for NULL.

I didn't write a test case for this because it seemed like overkill
for a Pascal bug that only occurs with -i=mi.  However, if you want
one, let me know and I will do it.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31524
---
 gdb/p-typeprint.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

John Baldwin March 28, 2024, 5:25 p.m. UTC | #1 
On 3/27/24 12:40 PM, Tom Tromey wrote:
> PR gdb/31524 points out a crash when pascal_language::print_type is
> called with varstring==nullptr.  This crash is a regression arising
> from the printf/pager rewrite -- that indirectly removed a NULL check
> from gdb's "puts".
> 
> This patch instead fixes the problem by adding a check to print_type.
> Passing nullptr here seems to be expected in other places (e.g., there
> is a call to type_print like this in expprint.c), and other
> implementations of this method (or related helpers) explicitly check
> for NULL.
> 
> I didn't write a test case for this because it seemed like overkill
> for a Pascal bug that only occurs with -i=mi.  However, if you want
> one, let me know and I will do it.
> 
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31524

Seems obvious to me.  I think it's fine without a test case.

Approved-By: John Baldwin <jhb@FreeBSD.org>
diff mbox series

Patch

diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index 5c48c1400c4..ad98d9ef202 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -54,7 +54,8 @@  pascal_language::print_type (struct type *type, const char *varstring,
       type_print_varspec_prefix (type, stream, show, 0, flags);
     }
   /* first the name */
-  gdb_puts (varstring, stream);
+  if (varstring != nullptr)
+    gdb_puts (varstring, stream);
 
   if ((varstring != NULL && *varstring != '\0')
       && !(code == TYPE_CODE_FUNC