aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-08-13 14:47:23 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-08-13 14:47:23 +0000
commit79f9ee9d15cdc4e96faa69135c4a2f734577e9d6 (patch)
tree3f7efdbee7cf6bda4052f6f487563b13efb358d3 /src/backend
parentd785841f831fd9bc9cf11ed62d8571910a71bd0c (diff)
downloadpostgresql-79f9ee9d15cdc4e96faa69135c4a2f734577e9d6.tar.gz
postgresql-79f9ee9d15cdc4e96faa69135c4a2f734577e9d6.zip
Fix core dumps, inability to count, etc associated with canonicalize_path
patches.
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/utils/fmgr/dfmgr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 07343f69ed2..111f9747101 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.75 2004/07/12 02:22:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.76 2004/08/13 14:47:23 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -405,10 +405,11 @@ find_in_dynamic_libpath(const char *basename)
strncpy(piece, p, len);
piece[len] = '\0';
- canonicalize_path(piece);
mangled = substitute_libpath_macro(piece);
pfree(piece);
+ canonicalize_path(mangled);
+
/* only absolute paths */
if (!is_absolute_path(mangled))
ereport(ERROR,