Commit4c91723

Thomas G. Lockhart

committed

Check for null pointer returned from get_opname().

Don't bother checking for alternate strategies if so since it was more likely a function or some other non-operator anyway.

1 parent0f19904 commit4c91723Copy full SHA for 4c91723

File tree

-3

lines changed

-3

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.29 1998/08/14 16:13:07 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.30 1998/08/16 05:37:04 thomas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -642,7 +642,10 @@ match_clause_to_indexkey(RelOptInfo *rel,`
`642`	`642`	`Operatornewop;`
`643`	`643`
`644`	`644`	`opname=get_opname(restrict_op);`
`645`		`-newop=oper(opname,ltype,ltype, TRUE);`
	`645`	`+if (opname!=NULL)`
	`646`	`+newop=oper(opname,ltype,ltype, TRUE);`
	`647`	`+else`
	`648`	`+newop=NULL;`
`646`	`649`
`647`	`650`	`/* actually have a different operator to try? */`
`648`	`651`	`if (HeapTupleIsValid(newop)&& (oprid(newop)!=restrict_op))`
`@@ -698,7 +701,10 @@ match_clause_to_indexkey(RelOptInfo *rel,`
`698`	`701`	`restrict_op= ((Oper) ((Expr)clause)->oper)->opno;`
`699`	`702`
`700`	`703`	`opname=get_opname(restrict_op);`
`701`		`-newop=oper(opname,rtype,rtype, TRUE);`
	`704`	`+if (opname!=NULL)`
	`705`	`+newop=oper(opname,rtype,rtype, TRUE);`
	`706`	`+else`
	`707`	`+newop=NULL;`
`702`	`708`
`703`	`709`	`if (HeapTupleIsValid(newop)&& (oprid(newop)!=restrict_op))`
`704`	`710`	`{`

Comments

(0)