LumeWeb
/
libs5-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ensure WebAppErrorPages id inited on decode, and return early as an empty map on encode

This commit is contained in:
Derrick Hammer 2024-03-03 04:41:52 -05:00
parent a02458b597
commit 9fbb0bb859
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
metadata/web_app.go
View File

@ -235,19 +235,21 @@ func (wafm *WebAppFileMap) DecodeMsgpack(decoder *msgpack.Decoder) error {
return nil return nil
} }
func (w WebAppErrorPages) EncodeMsgpack(enc *msgpack.Encoder) error { func (w *WebAppErrorPages) EncodeMsgpack(enc *msgpack.Encoder) error {
err := enc.EncodeMapLen(len(w)) if w == nil || *w == nil {
return enc.EncodeMapLen(0)
}
err := enc.EncodeMapLen(len(*w))
if err != nil { if err != nil {
return err return err
} }
for k, v := range w { for k, v := range *w {
err = enc.EncodeInt(int64(k)) if err := enc.EncodeInt(int64(k)); err != nil {
if err != nil {
return err return err
} }
err = enc.EncodeString(v) if err := enc.EncodeString(v); err != nil {
if err != nil {
return err return err
} }
} }
@ -256,6 +258,10 @@ func (w WebAppErrorPages) EncodeMsgpack(enc *msgpack.Encoder) error {
} }
func (w *WebAppErrorPages) DecodeMsgpack(dec *msgpack.Decoder) error { func (w *WebAppErrorPages) DecodeMsgpack(dec *msgpack.Decoder) error {
if *w == nil {
*w = make(map[int]string)
}
mapLen, err := dec.DecodeMapLen() mapLen, err := dec.DecodeMapLen()
if err != nil { if err != nil {
return err return err