Commit7148de1

committed

Prevent to divide by zero and range out of 0..1

1 parenta91fa39 commit7148de1Copy full SHA for 7148de1

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ calc_rank(float w, tsvector t, QUERYTYPE * q, int4 method)`
`288`	`288`	`{`
`289`	`289`	`ITEM*item=GETQUERY(q);`
`290`	`290`	`floatres=0.0;`
	`291`	`+intlen;`
`291`	`292`
`292`	`293`	`if (!t->size\|\| !q->size)`
`293`	`294`	`return0.0;`
`@@ -303,10 +304,11 @@ calc_rank(float w, tsvector t, QUERYTYPE * q, int4 method)`
`303`	`304`	`case0:`
`304`	`305`	`break;`
`305`	`306`	`case1:`
`306`		`-res /=log((float)cnt_length(t));`
	`307`	`+res /=log((float)(cnt_length(t)+1) ) /log(2.0);`
`307`	`308`	`break;`
`308`	`309`	`case2:`
`309`		`-res /= (float)cnt_length(t);`
	`310`	`+len=cnt_length(t);`
	`311`	`+if (len>0 )res /= (float)len;`
`310`	`312`	`break;`
`311`	`313`	`default:`
`312`	`314`	`/* internal error */`
`@@ -609,10 +611,11 @@ rank_cd(PG_FUNCTION_ARGS)`
`609`	`611`	`case0:`
`610`	`612`	`break;`
`611`	`613`	`case1:`
`612`		`-res /=log((float)cnt_length(txt));`
	`614`	`+res /=log((float)(cnt_length(txt)+1));`
`613`	`615`	`break;`
`614`	`616`	`case2:`
`615`		`-res /= (float)cnt_length(txt);`
	`617`	`+len=cnt_length(txt);`
	`618`	`+if (len>0 )res /= (float)len;`
`616`	`619`	`break;`
`617`	`620`	`default:`
`618`	`621`	`/* internal error */`

Comments

(0)