Skip to content

Commit 0d54b53

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix dumping of zend_string.val in gdb
2 parents d50393e + f18710e commit 0d54b53

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

.gdbinit

+18-18
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ define dump_bt
6666
if $func
6767
if $ex->This->value.obj
6868
if $func->common.scope
69-
printf "%s->", $func->common.scope->name->val
69+
printf "%s->", (char*)$func->common.scope->name->val
7070
else
71-
printf "%s->", $ex->This->value.obj->ce.name->val
71+
printf "%s->", (char*)$ex->This->value.obj->ce.name->val
7272
end
7373
else
7474
if $func->common.scope
75-
printf "%s::", $func->common.scope->name->val
75+
printf "%s::", (char*)$func->common.scope->name->val
7676
end
7777
end
7878

7979
if $func->common.function_name
80-
printf "%s(", $func->common.function_name->val
80+
printf "%s(", (char*)$func->common.function_name->val
8181
else
8282
printf "(main"
8383
end
@@ -109,7 +109,7 @@ define dump_bt
109109
printf "%f", $zvalue->value.dval
110110
end
111111
if $type == 6
112-
____print_str $zvalue->value.str->val $zvalue->value.str->len
112+
____print_str (char*)$zvalue->value.str->val $zvalue->value.str->len
113113
end
114114
if $type == 7
115115
printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
@@ -135,7 +135,7 @@ define dump_bt
135135
end
136136
if $func != 0
137137
if $func->type == 2
138-
printf "%s:%d ", $func->op_array.filename->val, $ex->opline->lineno
138+
printf "%s:%d ", (char*)$func->op_array.filename->val, $ex->opline->lineno
139139
else
140140
printf "[internal function]"
141141
end
@@ -186,7 +186,7 @@ define ____printzv_contents
186186
printf "double: %f", $zvalue->value.dval
187187
end
188188
if $type == 6
189-
printf "string: %s", $zvalue->value.str->val
189+
printf "string: %s", (char*)$zvalue->value.str->val
190190
end
191191
if $type == 7
192192
printf "array: "
@@ -208,7 +208,7 @@ define ____printzv_contents
208208
set $handle = $zvalue->value.obj.handle
209209
set $handlers = $zvalue->value.obj.handlers
210210
set $zobj = $zvalue->value.obj
211-
set $cname = $zobj->ce->name->val
211+
set $cname = (char*)$zobj->ce->name->val
212212
printf "(%s) #%d", $cname, $handle
213213
if ! $arg1
214214
if $handlers->get_properties == &zend_std_get_properties
@@ -233,7 +233,7 @@ define ____printzv_contents
233233
set $name = $p->key
234234
set $prop = (zend_property_info*)$p->val.value.ptr
235235
set $val = (zval*)((char*)$zobj + $prop->offset)
236-
printf "%s => ", $name->val
236+
printf "%s => ", (char*)$name->val
237237
printzv $val
238238
set $k = $k + 1
239239
end
@@ -348,7 +348,7 @@ define ____print_ht
348348
end
349349
printf "[%d] ", $i
350350
if $key
351-
____print_str $key->val $key->len
351+
____print_str (char*)$key->val $key->len
352352
printf " => "
353353
else
354354
printf "%d => ", $h
@@ -365,7 +365,7 @@ define ____print_ht
365365
end
366366
if $arg1 == 3
367367
set $func = (zend_function*)$val->value.ptr
368-
printf "\"%s\"\n", $func->common.function_name->val
368+
printf "\"%s\"\n", (char*)$func->common.function_name->val
369369
end
370370
if $arg1 == 4
371371
set $const = (zend_constant *)$val->value.ptr
@@ -423,15 +423,15 @@ define ____print_inh_class
423423
printf "final "
424424
end
425425
end
426-
printf "class %s", $ce->name->val
426+
printf "class %s", (char*)$ce->name->val
427427
if $ce->parent != 0
428-
printf " extends %s", $ce->parent->name->val
428+
printf " extends %s", (char*)$ce->parent->name->val
429429
end
430430
if $ce->num_interfaces != 0
431431
printf " implements"
432432
set $tmp = 0
433433
while $tmp < $ce->num_interfaces
434-
printf " %s", $ce->interfaces[$tmp]->name->val
434+
printf " %s", (char*)$ce->interfaces[$tmp]->name->val
435435
set $tmp = $tmp + 1
436436
if $tmp < $ce->num_interfaces
437437
printf ","
@@ -443,10 +443,10 @@ end
443443

444444
define ____print_inh_iface
445445
set $ce = $arg0
446-
printf "interface %s", $ce->name->val
446+
printf "interface %s", (char*)$ce->name->val
447447
if $ce->num_interfaces != 0
448448
set $ce = $ce->interfaces[0]
449-
printf " extends %s", $ce->name->val
449+
printf " extends %s", (char*)$ce->name->val
450450
else
451451
set $ce = 0
452452
end
@@ -486,7 +486,7 @@ define print_pi
486486
set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
487487
printf "[%p] {\n", $pi
488488
printf " offset = %p\n", $pi->offset
489-
printf " ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
489+
printf " ce = [%p] %s\n", $pi->ce, (char*)$pi->ce->name->val
490490
printf " flags = 0x%x (", $pi->flags
491491
if $pi->flags & 0x100
492492
printf "ZEND_ACC_PUBLIC"
@@ -608,7 +608,7 @@ define print_zstr
608608
set $maxlen = $zstr->len
609609
end
610610
printf "string(%d) ", $zstr->len
611-
____print_str $zstr->val $zstr->len $maxlen
611+
____print_str (char*)$zstr->val $zstr->len $maxlen
612612
printf "\n"
613613
end
614614

0 commit comments

Comments
 (0)