Merge pull request #450 from fantastao/fix_any_str_panic

AllenX2018 · web-flow · commit b22f3938580a · 2020-03-26T19:37:32.000+08:00
fix any str ToInt64 ToUint64 panic
diff --git a/any_str.go b/any_str.go
@@ -64,7 +64,6 @@ func (any *stringAny) ToInt64() int64 {
 
 	flag := 1
 	startPos := 0
-	endPos := 0
 	if any.val[0] == '+' || any.val[0] == '-' {
 		startPos = 1
 	}
@@ -73,6 +72,7 @@ func (any *stringAny) ToInt64() int64 {
 		flag = -1
 	}
 
+	endPos := startPos
 	for i := startPos; i < len(any.val); i++ {
 		if any.val[i] >= '0' && any.val[i] <= '9' {
 			endPos = i + 1
@@ -98,7 +98,6 @@ func (any *stringAny) ToUint64() uint64 {
 	}
 
 	startPos := 0
-	endPos := 0
 
 	if any.val[0] == '-' {
 		return 0
@@ -107,6 +106,7 @@ func (any *stringAny) ToUint64() uint64 {
 		startPos = 1
 	}
 
+	endPos := startPos
 	for i := startPos; i < len(any.val); i++ {
 		if any.val[i] >= '0' && any.val[i] <= '9' {
 			endPos = i + 1

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ func (any *stringAny) ToInt64() int64 {`
`64`	`64`
`65`	`65`	`flag := 1`
`66`	`66`	`startPos := 0`
`67`		`- endPos := 0`
`68`	`67`	`if any.val[0] == '+' \|\| any.val[0] == '-' {`
`69`	`68`	`startPos = 1`
`70`	`69`	`}`
`@@ -73,6 +72,7 @@ func (any *stringAny) ToInt64() int64 {`
`73`	`72`	`flag = -1`
`74`	`73`	`}`
`75`	`74`
	`75`	`+ endPos := startPos`
`76`	`76`	`for i := startPos; i < len(any.val); i++ {`
`77`	`77`	`if any.val[i] >= '0' && any.val[i] <= '9' {`
`78`	`78`	`endPos = i + 1`
`@@ -98,7 +98,6 @@ func (any *stringAny) ToUint64() uint64 {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`startPos := 0`
`101`		`- endPos := 0`
`102`	`101`
`103`	`102`	`if any.val[0] == '-' {`
`104`	`103`	`return 0`
`@@ -107,6 +106,7 @@ func (any *stringAny) ToUint64() uint64 {`
`107`	`106`	`startPos = 1`
`108`	`107`	`}`
`109`	`108`
	`109`	`+ endPos := startPos`
`110`	`110`	`for i := startPos; i < len(any.val); i++ {`
`111`	`111`	`if any.val[i] >= '0' && any.val[i] <= '9' {`
`112`	`112`	`endPos = i + 1`