Throw an exception when a NUL character is used as a parameter.

1 files changed, 6 insertions, 1 deletions

diff --git a/psycopg/utils.c b/psycopg/utils.c
index 1b10c4a..b919180 100644
--- a/psycopg/utils.c
+++ b/psycopg/utils.c
@@ -50,8 +50,13 @@ psycopg_escape_string(connectionObject *conn, const char *from, Py_ssize_t len,
     Py_ssize_t ql;
     int eq = (conn && (conn->equote)) ? 1 : 0;
 
-    if (len == 0)
+    if (len == 0) {
         len = strlen(from);
+    } else if (strchr(from, '\0') != from + len) {
+        PyErr_Format(PyExc_ValueError, "A string literal cannot contain NUL (0x00) characters.");
+
+	return NULL;
+    }
 
     if (to == NULL) {
         to = (char *)PyMem_Malloc((len * 2 + 4) * sizeof(char));