Bug 543040 – async reading on dummy file will crash on GIO_USE_VFS=local

Bug 543040 – async reading on dummy file will crash on GIO_USE_VFS=local * gfile.c (open_read_async_thread): Cope with read_fn being NULL. Reported by Lin Ma. svn path=/branches/glib-2-16/; revision=7213
dieterv · Jul 20, 2008 · 4e9d167 · 4e9d167
1 parent a5ccc1f
commit 4e9d167
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/gio/ChangeLog b/gio/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+	Merge from trunk:
+
+	Bug 543040 – async reading on dummy file will crash on
+	GIO_USE_VFS=local
+
+	* gfile.c (open_read_async_thread): Cope with read_fn being
+	NULL. Reported by Lin Ma.
+
 2008-07-19  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk:

diff --git a/gio/gfile.c b/gio/gfile.c
@@ -4012,6 +4012,18 @@ open_read_async_thread (GSimpleAsyncResult *res,
 
   iface = G_FILE_GET_IFACE (object);
 
+  if (iface->read_fn == NULL)
+    {
+      g_set_error_literal (error, G_IO_ERROR,
+                           G_IO_ERROR_NOT_SUPPORTED,
+                           _("Operation not supported"));
+
+      g_simple_async_result_set_from_error (res, error);
+      g_error_free (error);
+
+      return;
+    }
+
   stream = iface->read_fn (G_FILE (object), cancellable, &error);
 
   if (stream == NULL)