mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sizeof(EXE) arithmetic, per Andrew Dunstan.

Browse Source
This commit is contained in:
Tom Lane 2004-11-06 04:24:14 +00:00
parent 6105c9a145
commit d2f6c3e56c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/port/path.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/path.c,v 1.42 2004/11/06 01:16:22 tgl Exp $ * $PostgreSQL: pgsql/src/port/path.c,v 1.43 2004/11/06 04:24:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -285,7 +285,7 @@ get_progname(const char *argv0)
#if defined(__CYGWIN__) || defined(WIN32) #if defined(__CYGWIN__) || defined(WIN32)
/* strip .exe suffix, regardless of case */ /* strip .exe suffix, regardless of case */
if (strlen(nodir_name) > sizeof(EXE) - 1 && if (strlen(nodir_name) > sizeof(EXE) - 1 &&
pg_strcasecmp(nodir_name + strlen(nodir_name)-sizeof(EXE)-1, EXE) == 0) pg_strcasecmp(nodir_name + strlen(nodir_name)-(sizeof(EXE)-1), EXE) == 0)
{ {
char *progname; char *progname;
@ -295,7 +295,7 @@ get_progname(const char *argv0)
fprintf(stderr, "%s: out of memory\n", nodir_name); fprintf(stderr, "%s: out of memory\n", nodir_name);
exit(1); /* This could exit the postmaster */ exit(1); /* This could exit the postmaster */
} }
progname[strlen(progname) - sizeof(EXE) - 1] = '\0'; progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0';
nodir_name = progname; nodir_name = progname;
} }
#endif #endif