Fix for new pg_upgrade cache code.

diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 946e6ccb6bacc83ef979ff281e420bba446e1884..cd408e17636c4274f0eb3d8949d0b37c9f1c2cf2 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -429,7 +429,8 @@ relarr_lookup_rel(RelInfoArr *rel_arr,
                return NULL;
 
        /* Test most recent lookup first, for speed */
-       if (strcmp(rel_arr->rels[relnum].nspname, nspname) == 0 &&
+       if (relnum < rel_arr->nrels &&
+               strcmp(rel_arr->rels[relnum].nspname, nspname) == 0 &&
                strcmp(rel_arr->rels[relnum].relname, relname) == 0)
                return &rel_arr->rels[relnum];