Fix psql crash while parsing SQL file whose encoding is different from

tatsuo-ishii · tatsuo-ishii · commit eb851c998d2a · 2012-12-02T21:23:51.000+09:00
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
@@ -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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1656,7 +1656,7 @@ prepare_buffer(const char txt, int len, char *txtcopy)`
`1656`	`1656`	`/* first byte should always be okay... */`
`1657`	`1657`	`newtxt[i] = txt[i];`
`1658`	`1658`	`i++;`
`1659`		`- while (--thislen > 0)`
	`1659`	`+ while (--thislen > 0 && i < len)`
`1660`	`1660`	`newtxt[i++] = (char) 0xFF;`
`1661`	`1661`	`}`
`1662`	`1662`	`}`