projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a44811)
Tweak previous patch to ensure edata->filename always gets initialized.
authorTom Lane <tgl@sss.pgh.pa.us>
Wed, 30 Nov 2011 05:37:38 +0000 (00:37 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Wed, 30 Nov 2011 05:37:38 +0000 (00:37 -0500)
On a platform that isn't supplying __FILE__, previous coding would either
crash or give a stale result for the filename string.  Not sure how likely
that is, but the original code catered for it, so let's keep doing so.

src/backend/utils/error/elog.c patch | blob | blame | history

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 3bd8afc608aac33f85b36aaf55bb89876f96ad3c..952ed10c467331c5f02d30e2e12407eeb98ac6f2 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -331,8 +331,10 @@ errstart(int elevel, const char *filename, int lineno,
 
        /* keep only base name, useful especially for vpath builds */
        slash = strrchr(filename, '/');
-       edata->filename = slash ? slash + 1 : filename;
+       if (slash)
+           filename = slash + 1;
    }
+   edata->filename = filename;
    edata->lineno = lineno;
    edata->funcname = funcname;
    /* Select default errcode based on elevel */
@@ -956,8 +958,10 @@ elog_start(const char *filename, int lineno, const char *funcname)
 
        /* keep only base name, useful especially for vpath builds */
        slash = strrchr(filename, '/');
-       edata->filename = slash ? slash + 1 : filename;
+       if (slash)
+           filename = slash + 1;
    }
+   edata->filename = filename;
    edata->lineno = lineno;
    edata->funcname = funcname;
    /* errno is saved now so that error parameter eval can't change it */
This is the main PostgreSQL git repository.