postgres.git / summary / log / commit / refs

commit    646a93fe761eb2e1887fc8b3c9d778a6028b248d
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Nov 30 05:37:27 2011 +0000
First released in: 9.2.0, 8.2.23, 8.3.17, 8.4.10, 9.0.6, 9.1.2

    Tweak previous patch to ensure edata->filename always gets initialized.
    
    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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 428b4f9b6fd..6b3ba2a31ca 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -337,8 +337,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;
 	/* the default text domain is the backend's */
@@ -1112,8 +1114,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 */


[parent: fe0fa1f9b403]