diff options
Diffstat (limited to 'src/backend/utils/misc/tzparser.c')
| -rw-r--r-- | src/backend/utils/misc/tzparser.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c index a69cb2d2682..8f2c95f0550 100644 --- a/src/backend/utils/misc/tzparser.c +++ b/src/backend/utils/misc/tzparser.c @@ -364,7 +364,8 @@ ParseTzFile(const char *filename, int depth, { GUC_check_errmsg("could not read time zone file \"%s\": %m", filename); - return -1; + n = -1; + break; } /* else we're at EOF after all */ break; @@ -374,7 +375,8 @@ ParseTzFile(const char *filename, int depth, /* the line is too long for tzbuf */ GUC_check_errmsg("line is too long in time zone file \"%s\", line %d", filename, lineno); - return -1; + n = -1; + break; } /* skip over whitespace */ @@ -397,12 +399,13 @@ ParseTzFile(const char *filename, int depth, { GUC_check_errmsg("@INCLUDE without file name in time zone file \"%s\", line %d", filename, lineno); - return -1; + n = -1; + break; } n = ParseTzFile(includeFile, depth + 1, base, arraysize, n); if (n < 0) - return -1; + break; continue; } @@ -413,12 +416,18 @@ ParseTzFile(const char *filename, int depth, } if (!splitTzLine(filename, lineno, line, &tzentry)) - return -1; + { + n = -1; + break; + } if (!validateTzEntry(&tzentry)) - return -1; + { + n = -1; + break; + } n = addToArray(base, arraysize, n, &tzentry, override); if (n < 0) - return -1; + break; } FreeFile(tzFile); |