go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-06-15 22:50:24 +02:00
Code Issues Releases Activity

make ReadObject return safe string

Browse Source
This commit is contained in:
Tao Wen
2017-01-20 12:40:52 +08:00
parent a73e48e8bf
commit d14b025931
3 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
feature_iter_object.go
View File

@ -1,7 +1,5 @@
package jsoniter
import "unsafe"
// ReadObject is a implemented iterator for json
func (iter *Iterator) ReadObject() (ret string) {
c := iter.nextToken()
@ -25,13 +23,13 @@ func (iter *Iterator) ReadObject() (ret string) {
return "" // end of object
case '"':
iter.unreadByte()
return iter.readObjectField()
return string(iter.readObjectFieldAsBytes())
default:
iter.reportError("ReadObject", `expect " after {`)
return
}
case ',':
return iter.readObjectField()
return string(iter.readObjectFieldAsBytes())
case '}':
return "" // end of object
default:
@ -54,31 +52,33 @@ func (iter *Iterator) readObjectStart() bool {
return false
}
func (iter *Iterator) readObjectField() (ret string) {
func (iter *Iterator) readObjectFieldAsBytes() (ret []byte) {
str := iter.ReadStringAsSlice()
if iter.skipWhitespacesWithoutLoadMore() {
if ret == "" {
ret = string(str)
if ret == nil {
ret = make([]byte, len(str))
copy(ret, str)
}
if !iter.loadMore() {
return
}
}
if iter.buf[iter.head] != ':' {
iter.reportError("ReadObject", "expect : after object field")
iter.reportError("readObjectFieldAsBytes", "expect : after object field")
return
}
iter.head++
if iter.skipWhitespacesWithoutLoadMore() {
if ret == "" {
ret = string(str)
if ret == nil {
ret = make([]byte, len(str))
copy(ret, str)
}
if !iter.loadMore() {
return
}
}
if ret == "" {
return *(*string)(unsafe.Pointer(&str))
if ret == nil {
return str
}
return ret
}