database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Tweak previous patch to ensure edata->filename always gets initialized.

Browse Source 
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.
This commit is contained in:
Tom Lane 2011-11-30 00:37:06 -05:00
parent dd136052bc
commit a87ebace19
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/error/elog.c
View File

@ -349,8 +349,10 @@ errstart(int elevel, const char *filename, int lineno,
/* keep only base name, useful especially for vpath builds */ /* keep only base name, useful especially for vpath builds */
slash = strrchr(filename, '/'); slash = strrchr(filename, '/');
edata->filename = slash ? slash + 1 : filename; if (slash)
filename = slash + 1;
} }
edata->filename = filename;
edata->lineno = lineno; edata->lineno = lineno;
edata->funcname = funcname; edata->funcname = funcname;
/* the default text domain is the backend's */ /* 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 */ /* keep only base name, useful especially for vpath builds */
slash = strrchr(filename, '/'); slash = strrchr(filename, '/');
edata->filename = slash ? slash + 1 : filename; if (slash)
filename = slash + 1;
} }
edata->filename = filename;
edata->lineno = lineno; edata->lineno = lineno;
edata->funcname = funcname; edata->funcname = funcname;
/* errno is saved now so that error parameter eval can't change it */ /* errno is saved now so that error parameter eval can't change it */