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 5fefa475af6c529dd8f1a3156b9695045e8663f3..f9970859e2ea255e3c93bdadb3d666e202a15b7e 100644 (file)
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -1806,7 +1806,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;
        }
    }