From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sun, 2 Dec 2012 12:11:15 +0000 (+0900)
Subject: Fix psql crash while parsing SQL file whose encoding is different from
X-Git-Tag: REL8_3_22~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb851c998d2a37a6512a26dba11a303babe6316a;p=postgresql

Fix psql crash while parsing SQL file whose encoding is different from
client encoding and the client encoding is not *safe* one. Such an
example is, file encoding is UTF-8 and client encoding SJIS. Patch
contributed by Jiang Guiqing.
---

diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index e89f2d9bd6..36902210b8 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -1656,7 +1656,7 @@ prepare_buffer(const char *txt, int len, char **txtcopy)
 			/* first byte should always be okay... */
 			newtxt[i] = txt[i];
 			i++;
-			while (--thislen > 0)
+			while (--thislen > 0 && i < len)
 				newtxt[i++] = (char) 0xFF;
 		}
 	}