GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

pbot-vm: fix occasional "illegal escape sequence" in guest-gdb

This commit is contained in:
Pragmatic Software 2022-03-15 13:53:34 -07:00
parent bf8749ff9e
commit 01cefe462f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applets/pbot-vm/guest/bin/guest-gdb
View File

@ -142,9 +142,17 @@ sub gdb_read_result($out) {
return $output;
}
sub gdbmi_to_json($text, $makejson = 1) {
# convert gdb/mi text to hashtable, converting to JSON first if necessary
sub gdbmi_to_hash($text, $makejson = 1) {
# convert to JSON first if necessary (gdb/mi is nearly JSON already!)
$text =~ s/([\w-]+)=/"$1":/g if $makejson;
$text =~ s/\\(\d{3})/$1 >= 0x20 ? chr oct $1 : "\\$1"/ge;
# decode gdb octal escapes
# (sometimes \\123, othertimes \123 and I can't be arsed to investigate
# when and why the backslashes double up)
$text =~ s/\\+(\d{3})/$1 >= 0x20 ? chr oct $1 : "\\\\$1"/ge;
# return hashtable decoded from json
return decode_json("{$text}");
}
@ -165,7 +173,7 @@ sub parse_gdbmi_output($line) {
$text = "\"_text\":$text";
}
my $output = gdbmi_to_json($text, $makejson);
my $output = gdbmi_to_hash($text, $makejson);
if (exists $output->{_text}) {
chomp $output->{_text};