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

pbot-vm: fix invalid character encountered in JSON string

This commit is contained in:
Pragmatic Software 2022-04-04 21:41:27 -07:00
parent 4535881898
commit 757088987d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ no warnings qw(experimental::signatures);
use IPC::Open2;
use JSON::XS;
use Data::Dumper;
use Encode qw(decode encode);
# set debug flag from DEBUG env or here
my $debug = $ENV{DEBUG} // 0;
@ -152,6 +153,13 @@ sub gdbmi_to_hash($text, $makejson = 1) {
# when and why the backslashes double up)
$text =~ s/\\+(\d{3})/$1 >= 0x20 ? chr oct $1 : "\\\\$1"/ge;
# fix unicode
my $octets = decode('UTF-8', $text, Encode::FB_DEFAULT);
$text = encode('UTF-8', $octets, Encode::FB_CROAK);
# escape invalid JSON characters
$text =~ s/([\x10-\x1f])/sprintf '\\\\x{%x}', ord $1/ge;
# return hashtable decoded from json
return decode_json("{$text}");
}

2
lib/PBot/VERSION.pm
View File

@ -25,7 +25,7 @@ use PBot::Imports;
# These are set by the /misc/update_version script
use constant {
BUILD_NAME => "PBot",
BUILD_REVISION => 4521,
BUILD_REVISION => 4523,
BUILD_DATE => "2022-04-04",
};