Commit 4c91723d authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

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.
parent 0f199043
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.29 1998/08/14 16:13:07 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.30 1998/08/16 05:37:04 thomas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -642,7 +642,10 @@ match_clause_to_indexkey(RelOptInfo *rel, ...@@ -642,7 +642,10 @@ match_clause_to_indexkey(RelOptInfo *rel,
Operator newop; Operator newop;
opname = get_opname(restrict_op); opname = get_opname(restrict_op);
newop = oper(opname, ltype, ltype, TRUE); if (opname != NULL)
newop = oper(opname, ltype, ltype, TRUE);
else
newop = NULL;
/* actually have a different operator to try? */ /* actually have a different operator to try? */
if (HeapTupleIsValid(newop) && (oprid(newop) != restrict_op)) if (HeapTupleIsValid(newop) && (oprid(newop) != restrict_op))
...@@ -698,7 +701,10 @@ match_clause_to_indexkey(RelOptInfo *rel, ...@@ -698,7 +701,10 @@ match_clause_to_indexkey(RelOptInfo *rel,
restrict_op = ((Oper *) ((Expr *) clause)->oper)->opno; restrict_op = ((Oper *) ((Expr *) clause)->oper)->opno;
opname = get_opname(restrict_op); opname = get_opname(restrict_op);
newop = oper(opname, rtype, rtype, TRUE); if (opname != NULL)
newop = oper(opname, rtype, rtype, TRUE);
else
newop = NULL;
if (HeapTupleIsValid(newop) && (oprid(newop) != restrict_op)) if (HeapTupleIsValid(newop) && (oprid(newop) != restrict_op))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment