Commit51ea33c

authored

Fix possible out of bound array access (haoel#254)

Should check array size before accessing the second to fourth bytes ofutf8 as there might be not enough data left in the array.

1 parent36168cc commit51ea33cCopy full SHA for 51ea33c

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ class Solution {`
`67`	`67`	`returnfalse;`
`68`	`68`	`}`
`69`	`69`
	`70`	`+// invalid utf-8 as it doesn't have enough 10xxxxxx`
	`71`	`+if (i + len > data.size()) {`
	`72`	`+returnfalse;`
	`73`	`+ }`
`70`	`74`
`71`	`75`	`for (int j=i+1; j < i+len; j++) {//checking 10xxxxxx`
`72`	`76`	`if ( (data[j] &0xC0) !=0x80 ) {`
`@@ -75,11 +79,6 @@ class Solution {`
`75`	`79`	`}`
`76`	`80`
`77`	`81`	`i += len ;`
`78`		`-`
`79`		`-if (i > data.size()) {`
`80`		`-returnfalse;`
`81`		`- }`
`82`		`-`
`83`	`82`	`}`
`84`	`83`	`returntrue;`
`85`	`84`	`}`

Comments

(0)