Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4dfb065

Browse files
committed
Fix bogus handling of bad strategy number in GIST consistent() functions.
Make sure we throw an error instead of silently doing the wrong thing whenfed a strategy number we don't recognize. Also, in the places that didalready throw an error, spell the error message in a way more consistentwith our message style guidelines.Per report from Paul Jones. Although this is a bug, it won't occur unlessa superuser tries to do something he shouldn't, so it doesn't seem worthback-patching.
1 parentf0aa6c0 commit4dfb065

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

‎src/backend/access/gist/gistproc.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,9 @@ gist_box_leaf_consistent(BOX *key, BOX *query, StrategyNumber strategy)
926926
PointerGetDatum(query)));
927927
break;
928928
default:
929-
retval= FALSE;
929+
elog(ERROR,"unrecognized strategy number: %d",strategy);
930+
retval= false;/* keep compiler quiet */
931+
break;
930932
}
931933
returnretval;
932934
}
@@ -1015,7 +1017,9 @@ rtree_internal_consistent(BOX *key, BOX *query, StrategyNumber strategy)
10151017
PointerGetDatum(query)));
10161018
break;
10171019
default:
1018-
retval= FALSE;
1020+
elog(ERROR,"unrecognized strategy number: %d",strategy);
1021+
retval= false;/* keep compiler quiet */
1022+
break;
10191023
}
10201024
returnretval;
10211025
}
@@ -1306,7 +1310,9 @@ gist_point_consistent_internal(StrategyNumber strategy,
13061310
}
13071311
break;
13081312
default:
1309-
elog(ERROR,"unknown strategy number: %d",strategy);
1313+
elog(ERROR,"unrecognized strategy number: %d",strategy);
1314+
result= false;/* keep compiler quiet */
1315+
break;
13101316
}
13111317

13121318
returnresult;
@@ -1422,8 +1428,9 @@ gist_point_consistent(PG_FUNCTION_ARGS)
14221428
}
14231429
break;
14241430
default:
1425-
elog(ERROR,"unknown strategy number: %d",strategy);
1431+
elog(ERROR,"unrecognized strategy number: %d",strategy);
14261432
result= false;/* keep compiler quiet */
1433+
break;
14271434
}
14281435

14291436
PG_RETURN_BOOL(result);
@@ -1445,8 +1452,9 @@ gist_point_distance(PG_FUNCTION_ARGS)
14451452
PG_GETARG_POINT_P(1));
14461453
break;
14471454
default:
1448-
elog(ERROR,"unknown strategy number: %d",strategy);
1455+
elog(ERROR,"unrecognized strategy number: %d",strategy);
14491456
distance=0.0;/* keep compiler quiet */
1457+
break;
14501458
}
14511459

14521460
PG_RETURN_FLOAT8(distance);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp