Debugging libpyfcgi.IoIn.read()

A '\0' need to be added to read string if read exactly the expected ammount of
bytes.

src/python_ioin.c

@@ -194,6 +194,7 @@ PyObject* pyfcgi_ioin_readline(PyObject *self, PyObject **argv, Py_ssize_t argc)
 		((IoIn*)self)->eof = 1;
 		ret = "";
 	}
+//dprintf(2, "readline : '%s'\n", ret);
 	return IoIn__FromString(self, ret);
 }
 
@@ -269,6 +270,7 @@ PyObject* pyfcgi_ioin_readlines(PyObject *self, PyObject **argv, Py_ssize_t argc
 
 		if(buff[sz-1] == '\n')
 		{
+//dprintf(2, "readlines : '%s'\n", PyUnicode_AsUTF8(cur_str));
 			if(PyList_Append(res, cur_str))
 			{
 				Py_DECREF(cur_str);
@@ -280,6 +282,7 @@ PyObject* pyfcgi_ioin_readlines(PyObject *self, PyObject **argv, Py_ssize_t argc
 	}
 	if(cur_str)
 	{
+//dprintf(2, "readlines(post) : '%s'\n", PyUnicode_AsUTF8(cur_str));
 		if(PyList_Append(res, cur_str))
 		{
 			Py_DECREF(cur_str);
@@ -293,9 +296,9 @@ PyObject* pyfcgi_ioin_readlines(PyObject *self, PyObject **argv, Py_ssize_t argc
 
 PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
-	size_t left, sz, max;
+	size_t left, max;
 	long l;
-	int read_n, toread, ret;
+	int read_n, toread, sz;
 	PyObject *res, *read_str;
 	char *buff;
 
@@ -337,11 +340,10 @@ PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 	while((max && left) || !max)
 	{
 		toread = (max&&((size_t)read_n > left))?(int)left:read_n;
-		ret = FCGX_GetStr(buff, toread, *((IoIn*)self)->in_stream);
-
-		sz = strlen(buff);
+		sz = FCGX_GetStr(buff, toread, *((IoIn*)self)->in_stream);
 		if(sz)
 		{
+			if(sz == toread) { buff[sz] = '\0'; }
 			left -= sz;
 			if(!(read_str = IoIn__FromBuff(self)))
 			{
@@ -355,7 +357,7 @@ PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 			Py_INCREF(res);
 		}
 
-		if( ret < toread)
+		if( sz < toread)
 		{
 			((IoIn*)self)->eof = 1;
 			break;
@@ -375,6 +377,7 @@ PyObject* pyfcgi_ioin_readall(PyObject *self, PyObject **argv, Py_ssize_t argc)
 			argc);
 		Py_RETURN_NONE;
 	}
+dprintf(2, "readall calling read : ");
 	return pyfcgi_ioin_read(self, NULL, 0);
 }
 
@@ -418,6 +421,8 @@ PyObject* pyfcgi_ioin_readinto(PyObject *self, PyObject **argv, Py_ssize_t argc)
 		left -= ret;
 
 	}
+//dprintf(2, "readinto chr buff : '%s'\n", buff);
+//dprintf(2, "readinto bytes repr : '%s'\n", PyByteArray_AsString(b));
 	return b;
 }