diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-11-30 00:37:06 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-11-30 00:37:06 -0500 |
| commit | a87ebace190b16bbc6454bb93bae3356712aa3ca (patch) | |
| tree | bb88685f61ca8eadfa74df452e069afdbe1a0039 /src | |
| parent | dd136052bcc8281dd3faa77e717cd7cec216f7c7 (diff) | |
| download | postgresql-a87ebace190b16bbc6454bb93bae3356712aa3ca.tar.gz postgresql-a87ebace190b16bbc6454bb93bae3356712aa3ca.zip | |
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.
Diffstat (limited to 'src')
| -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 0131c06ba4d..d8d059f11c9 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -349,8 +349,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 */ @@ -1155,8 +1157,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 */ |