From 2a65977a44ad172c6460c708cf7b79639f21d851 Mon Sep 17 00:00:00 2001 From: wish Date: Thu, 11 Aug 2022 02:53:51 +1000 Subject: [PATCH] prevent panic on invalid string transform --- common/pascalstring/pascalstring.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/pascalstring/pascalstring.go b/common/pascalstring/pascalstring.go index 3640db22d..8ad332018 100644 --- a/common/pascalstring/pascalstring.go +++ b/common/pascalstring/pascalstring.go @@ -11,7 +11,8 @@ func Uint8(bf *byteframe.ByteFrame, x string, t bool) { e := japanese.ShiftJIS.NewEncoder() xt, _, err := transform.String(e, x) if err != nil { - panic(err) + bf.WriteUint8(0) + return } x = xt } @@ -24,7 +25,8 @@ func Uint16(bf *byteframe.ByteFrame, x string, t bool) { e := japanese.ShiftJIS.NewEncoder() xt, _, err := transform.String(e, x) if err != nil { - panic(err) + bf.WriteUint16(0) + return } x = xt } @@ -37,7 +39,8 @@ func Uint32(bf *byteframe.ByteFrame, x string, t bool) { e := japanese.ShiftJIS.NewEncoder() xt, _, err := transform.String(e, x) if err != nil { - panic(err) + bf.WriteUint32(0) + return } x = xt }