Commit9f3bd29

committed

Faster test for overflow in str2txid, from Marko.

1 parentb196b7f commit9f3bd29Copy full SHA for 9f3bd29

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -234,24 +234,27 @@ static txid`
`234`	`234`	`str2txid(constchars,constchar*endp)`
`235`	`235`	`{`
`236`	`236`	`txidval=0;`
	`237`	`+txidcutoff=MAX_TXID /10;`
	`238`	`+txidcutlim=MAX_TXID %10;`
`237`	`239`
`238`	`240`	`for (;*s;s++)`
`239`	`241`	`{`
`240`		`-txidlast=val;`
	`242`	`+unsignedd;`
`241`	`243`
`242`	`244`	`if (s<'0'\|\|s>'9')`
`243`	`245`	`break;`
`244`		`-`
`245`		`-val=val10+ (s-'0');`
	`246`	`+d=*s-'0';`
`246`	`247`
`247`	`248`	`/*`
`248`	`249`	`* check for overflow`
`249`	`250`	`*/`
`250`		`-if (val>MAX_TXID\|\| (val/10)!=last)`
	`251`	`+if (val>cutoff\|\| (val==cutoff&&d>cutlim))`
`251`	`252`	`{`
`252`	`253`	`val=0;`
`253`	`254`	`break;`
`254`	`255`	`}`
	`256`	`+`
	`257`	`+val=val*10+d;`
`255`	`258`	`}`
`256`	`259`	`if (endp)`
`257`	`260`	`*endp=s;`

Comments

(0)