summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Matthew <jonathan@d14n.org>2008-09-07 01:05:15 +0000
committerJonathan Matthew <jmatthew@src.gnome.org>2008-09-07 01:05:15 +0000
commit71e1578961a3c925ddea477c0b9d0313d61350e8 (patch)
treeafc7e251def7f064aa40f3e859b760dab92f5ecf
parente4b059c0a89404303f888979bf81c28ddda62cd8 (diff)
downloadpygobject-71e1578961a3c925ddea477c0b9d0313d61350e8.tar.gz
pygobject-71e1578961a3c925ddea477c0b9d0313d61350e8.tar.xz
pygobject-71e1578961a3c925ddea477c0b9d0313d61350e8.zip
Bug 551059 – GFile load_contents methods chop data at first \0
2008-09-07 Jonathan Matthew <jonathan@d14n.org> Bug 551059 – GFile load_contents methods chop data at first \0 * gio/gfile.override: Use 's#' (length specified) rather than 's' when constructing result values in load_contents and load_contents_finish. svn path=/trunk/; revision=965
-rw-r--r--ChangeLog8
-rw-r--r--gio/gfile.override4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b02f1e..2405dd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-07 Jonathan Matthew <jonathan@d14n.org>
+
+ Bug 551059 – GFile load_contents methods chop data at first \0
+
+ * gio/gfile.override:
+ Use 's#' (length specified) rather than 's' when constructing
+ result values in load_contents and load_contents_finish.
+
2008-09-03 Johan Dahlin <johan@gnome.org>
* configure.ac:
diff --git a/gio/gfile.override b/gio/gfile.override
index 3a6f129..fb01203 100644
--- a/gio/gfile.override
+++ b/gio/gfile.override
@@ -196,7 +196,7 @@ _wrap_g_file_load_contents(PyGObject *self,
return NULL;
if (ret)
- return Py_BuildValue("(sks)", contents, lenght, etag_out);
+ return Py_BuildValue("(s#ks)", contents, length, length, etag_out);
else {
Py_INCREF(Py_None);
return Py_None;
@@ -270,7 +270,7 @@ _wrap_g_file_load_contents_finish(PyGObject *self,
return NULL;
if (ret)
- return Py_BuildValue("(sks)", contents, lenght, etag_out);
+ return Py_BuildValue("(s#ks)", contents, length, length, etag_out);
else {
Py_INCREF(Py_None);
return Py_None;