A little paranoia never hurt anyone.

diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 56e2bd3da2e0d9932c640db805f54d813538e8d4..8a2b03408e02f7f2a72beac30332c863fba1b766 100644 (file)
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -222,8 +222,10 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
                                /* Found it; extract the OID and the database path. */
                                *db_id = tup.t_data->t_oid;
                                pathlen = VARSIZE(&(tup_db->datpath)) - VARHDRSZ;
+                               if (pathlen < 0)
+                                       pathlen = 0;                            /* pure paranoia */
                                if (pathlen >= MAXPGPATH)
-                                       pathlen = MAXPGPATH - 1;        /* pure paranoia */
+                                       pathlen = MAXPGPATH - 1;        /* more paranoia */
                                strncpy(path, VARDATA(&(tup_db->datpath)), pathlen);
                                path[pathlen] = '\0';
                                goto done;