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

tatsuo-ishii · tatsuo-ishii · commit 53edb8dc0274 · 2012-12-02T21:11:15.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
@@ -1807,7 +1807,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
`@@ -1807,7 +1807,7 @@ prepare_buffer(const char txt, int len, char *txtcopy)`
`1807`	`1807`	`/* first byte should always be okay... */`
`1808`	`1808`	`newtxt[i] = txt[i];`
`1809`	`1809`	`i++;`
`1810`		`- while (--thislen > 0)`
	`1810`	`+ while (--thislen > 0 && i < len)`
`1811`	`1811`	`newtxt[i++] = (char) 0xFF;`
`1812`	`1812`	`}`
`1813`	`1813`	`}`