From 205b5c2f4bebfeced12a0fb1664c289ffabda258 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 5 May 2002 17:50:04 +0000 Subject: [PATCH] A little paranoia never hurt anyone. --- src/backend/utils/misc/database.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index 293d9df525..6013c8da12 100644 --- a/src/backend/utils/misc/database.c +++ b/src/backend/utils/misc/database.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.49 2001/10/25 05:49:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.50 2002/05/05 17:50:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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; -- 2.40.0