diff options
| author | Tom Lane | 2011-11-30 05:37:14 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-11-30 05:37:14 +0000 |
| commit | b2b1220dee279e9981bf8bf0e1e01e65bffe373c (patch) | |
| tree | 580201071664346d752762de8fbc3313b64a9e08 | |
| parent | 81a50686b884632d2e8b18ecb4c70ea2f39178d6 (diff) | |
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.
| -rw-r--r-- | src/backend/utils/error/elog.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 8471d92f57f..fee69dfc172 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -348,8 +348,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 */ @@ -1154,8 +1156,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 */ |