From 3a5d0c55338e6beb4c01ed5fadb1462e90db7545 Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Wed, 12 Jun 2013 19:50:52 -0400 Subject: [PATCH] Avoid reading below the start of a stack variable in tokenize_file(). We would wrongly overwrite the prior stack byte if it happened to contain '\n' or '\r'. New in 9.3, so no back-patch. --- src/backend/libpq/hba.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index e946a4659f2..91f6ced0d2f 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -411,9 +411,9 @@ tokenize_file(const char *filename, FILE *file, line_number, filename))); /* Strip trailing linebreak from rawline */ - while (rawline[strlen(rawline) - 1] == '\n' || - rawline[strlen(rawline) - 1] == '\r') - rawline[strlen(rawline) - 1] = '\0'; + lineptr = rawline + strlen(rawline) - 1; + while (lineptr >= rawline && (*lineptr == '\n' || *lineptr == '\r')) + *lineptr-- = '\0'; lineptr = rawline; while (strlen(lineptr) > 0)