From 55994f83e0799e8046151ef4ac81054e69f29b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 13 Feb 2025 17:19:47 +0100 Subject: [PATCH] php_gdb: Fix missing casts in `ZendAstPrettyPrinter` (#17786) Fixes php/php-src#17782 --- main/debug_gdb_scripts.c | 4 +--- scripts/gdb/php_gdb.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/main/debug_gdb_scripts.c b/main/debug_gdb_scripts.c index eef618bd033..6368b403d5c 100644 --- a/main/debug_gdb_scripts.c +++ b/main/debug_gdb_scripts.c @@ -849,12 +849,10 @@ asm( ".ascii \" if int(c) != 0:\\n\"\n" ".ascii \" c = c.dereference()\\n\"\n" ".ascii \" yield ('child[%d]' % i, c)\\n\"\n" - ".ascii \" elif field.name == 'name':\\n\"\n" - ".ascii \" yield (field.name, format_zstr(val[field.name]))\\n\"\n" ".ascii \" elif field.name == 'val':\\n\"\n" ".ascii \" yield (field.name, ZvalPrettyPrinter(val[field.name]).to_string())\\n\"\n" ".ascii \" else:\\n\"\n" - ".ascii \" yield (field.name, format_nested(self.val[field.name]))\\n\"\n" + ".ascii \" yield (field.name, format_nested(val[field.name]))\\n\"\n" ".ascii \"\\n\"\n" ".ascii \" def is_special(self):\\n\"\n" ".ascii \" special_shift = 6 # ZEND_AST_SPECIAL_SHIFT\\n\"\n" diff --git a/scripts/gdb/php_gdb.py b/scripts/gdb/php_gdb.py index 3bd66c8d88f..8841833a32e 100644 --- a/scripts/gdb/php_gdb.py +++ b/scripts/gdb/php_gdb.py @@ -179,12 +179,10 @@ class ZendAstPrettyPrinter(gdb.printing.PrettyPrinter): if int(c) != 0: c = c.dereference() yield ('child[%d]' % i, c) - elif field.name == 'name': - yield (field.name, format_zstr(val[field.name])) elif field.name == 'val': yield (field.name, ZvalPrettyPrinter(val[field.name]).to_string()) else: - yield (field.name, format_nested(self.val[field.name])) + yield (field.name, format_nested(val[field.name])) def is_special(self): special_shift = 6 # ZEND_AST_SPECIAL_SHIFT