Rev 1377: Extra type checking. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1377
revision-id: jelmer at samba.org-20080627160656-euinqa9o58zele7x
parent: jelmer at samba.org-20080627160625-f91ndu87b61qqeip
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-06-27 18:06:56 +0200
message:
  Extra type checking.
modified:
  util.c                         util.c-20080531154025-s8ef6ej9tytsnkkw-1
=== modified file 'util.c'
--- a/util.c	2008-06-24 10:00:17 +0000
+++ b/util.c	2008-06-27 16:06:56 +0000
@@ -263,7 +263,10 @@
     ret = PyObject_CallMethod(self, "read", "i", *length);
 	if (ret == NULL)
 		return py_svn_error();
-	/* FIXME: Handle !PyString_Check(ret) */
+	if (!PyString_Check(ret)) {
+		PyErr_SetString(PyExc_TypeError, "Expected stream read function to return string");
+		return py_svn_error();
+	}
     *length = PyString_Size(ret);
     memcpy(buffer, PyString_AS_STRING(ret), *length);
 	Py_DECREF(ret);
@@ -284,9 +287,9 @@
 {
     PyObject *self = (PyObject *)baton, *ret;
     ret = PyObject_CallMethod(self, "close", NULL);
-	if (ret == NULL)
-		return py_svn_error();
     Py_DECREF(self);
+	if (ret == NULL)
+		return py_svn_error();
 	Py_DECREF(ret);
 	return NULL;
 }