blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: StringValue When there are double quotes in the string value, serialization and deserialization fail (#646)

Browse Source 
Signed-off-by: withchao <993506633@qq.com>
This commit is contained in:
withchao 2023-07-24 18:07:31 +08:00 committed by GitHub
parent 00b4483065
commit 9ef94ad46b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/proto/wrapperspb/wrapperspb.go
View File

@ -16,6 +16,7 @@ package wrapperspb
import (
"encoding/base64"
"encoding/json"
"errors"
"strconv"
)
@ -211,15 +212,11 @@ func (m *BoolValue) MarshalJSON() ([]byte, error) {
}
func (m *StringValue) UnmarshalJSON(p []byte) error {
if len(p) < 2 || p[0] != '"' || p[len(p)-1] != '"' {
return errors.New("invalid string value")
}
m.Value = string(p[1 : len(p)-1])
return nil
return json.Unmarshal(p, &m.Value)
}
func (m *StringValue) MarshalJSON() ([]byte, error) {
return []byte(`"` + m.Value + `"`), nil
return json.Marshal(m.Value)
}
func (m *BytesValue) UnmarshalJSON(p []byte) error {