lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-03 07:56:42 -05:00
Code Issues Releases Wiki Activity

fix parser for escape

Browse Source
This commit is contained in:
Darien Raymond 2016-12-15 15:53:23 +01:00
parent 1ab02e0a6b
commit 4e3ed19308
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/conf/json/reader.go
View File

@ -4,6 +4,7 @@ import (
"io" "io"
) )
// State is the internal state of parser.
type State byte type State byte
const ( const (
@ -50,7 +51,7 @@ func (v *Reader) Read(b []byte) (int, error) {
p = append(p, x) p = append(p, x)
} }
case StateEscape: case StateEscape:
p = append(p, x) p = append(p, '\\', x)
v.state = StateContent v.state = StateContent
case StateDoubleQuote: case StateDoubleQuote:
switch x { switch x {

2
tools/conf/json/reader_test.go
View File

@ -4,6 +4,7 @@ import (
"testing" "testing"
"bytes" "bytes"
"v2ray.com/core/testing/assert" "v2ray.com/core/testing/assert"
. "v2ray.com/core/tools/conf/json" . "v2ray.com/core/tools/conf/json"
) )
@ -33,6 +34,7 @@ text text 2*`},
{`"//"content`, `"//"content`}, {`"//"content`, `"//"content`},
{`abcd'//'abcd`, `abcd'//'abcd`}, {`abcd'//'abcd`, `abcd'//'abcd`},
{`"\""`, `"\""`}, {`"\""`, `"\""`},
{`\"/*abcd*/\"`, `\"\"`},
} }
for _, testCase := range data { for _, testCase := range data {