GMemoryInputStream/GMemoryOutputStream: fix bug in previous commit

A g_input_stream_read_async() implementation can't call
g_input_stream_read() on itself directly because it will fail because
the pending flag is already set. So fix that by invoking the vmethod
directly rather than calling the wrapper. Likewise with
GMemoryOutputStream.

Add a test to gio/tests/memory-input-stream.c to catch read_async
failures in the future.

diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c
index 47f4873..2a57dbd 100644 (file)
--- a/gio/gmemoryinputstream.c
+++ b/gio/gmemoryinputstream.c
@@ -345,14 +345,22 @@ g_memory_input_stream_read_async (GInputStream        *stream,
                                   gpointer             user_data)
 {
   GSimpleAsyncResult *simple;
+  GError *error = NULL;
   gssize nread;
 
-  nread = g_input_stream_read (stream, buffer, count, cancellable, NULL);
+  nread = G_INPUT_STREAM_GET_CLASS (stream)->read_fn (stream,
+                                                     buffer,
+                                                     count,
+                                                     cancellable,
+                                                     &error);
   simple = g_simple_async_result_new (G_OBJECT (stream),
                                      callback,
                                      user_data,
                                      g_memory_input_stream_read_async);
-  g_simple_async_result_set_op_res_gssize (simple, nread);
+  if (error)
+    g_simple_async_result_take_error (simple, error);
+  else
+    g_simple_async_result_set_op_res_gssize (simple, nread);
   g_simple_async_result_complete_in_idle (simple);
   g_object_unref (simple);
 }

diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c
index 78c1139..182d2de 100644 (file)
--- a/gio/gmemoryoutputstream.c
+++ b/gio/gmemoryoutputstream.c
@@ -620,20 +620,24 @@ g_memory_output_stream_write_async (GOutputStream       *stream,
                                     gpointer             data)
 {
   GSimpleAsyncResult *simple;
+  GError *error = NULL;
   gssize nwritten;
 
-  nwritten = g_output_stream_write (stream,
-                                   buffer,
-                                   count,
-                                   cancellable,
-                                   NULL);
+  nwritten = G_OUTPUT_STREAM_GET_CLASS (stream)->write_fn (stream,
+                                                          buffer,
+                                                          count,
+                                                          cancellable,
+                                                          &error);
 
   simple = g_simple_async_result_new (G_OBJECT (stream),
                                       callback,
                                       data,
                                       g_memory_output_stream_write_async);
 
-  g_simple_async_result_set_op_res_gssize (simple, nwritten);
+  if (error)
+    g_simple_async_result_take_error (simple, error);
+  else
+    g_simple_async_result_set_op_res_gssize (simple, nwritten);
   g_simple_async_result_complete_in_idle (simple);
   g_object_unref (simple);
 }

diff --git a/gio/tests/memory-input-stream.c b/gio/tests/memory-input-stream.c
index 6651695..753dfe9 100644 (file)
--- a/gio/tests/memory-input-stream.c
+++ b/gio/tests/memory-input-stream.c
@@ -67,6 +67,71 @@ test_read_chunks (void)
   g_object_unref (stream);
 }
 
+GMainLoop *loop;
+
+static void
+async_read_chunk (GObject      *object,
+                 GAsyncResult *result,
+                 gpointer      user_data)
+{
+  gsize *bytes_read = user_data;
+  GError *error = NULL;
+
+  *bytes_read = g_input_stream_read_finish (G_INPUT_STREAM (object),
+                                           result, &error);
+  g_assert_no_error (error);
+
+  g_main_loop_quit (loop);
+}
+
+static void
+test_async (void)
+{
+  const char *data1 = "abcdefghijklmnopqrstuvwxyz";
+  const char *data2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  const char *result = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  char buffer[128];
+  gsize bytes_read, pos, len, chunk_size;
+  GError *error = NULL;
+  GInputStream *stream;
+  gboolean res;
+
+  loop = g_main_loop_new (NULL, FALSE);
+
+  stream = g_memory_input_stream_new ();
+
+  g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream),
+                                  data1, -1, NULL);  
+  g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream),
+                                  data2, -1, NULL);  
+  len = strlen (data1) + strlen (data2);
+
+  for (chunk_size = 1; chunk_size < len - 1; chunk_size++)
+    {
+      pos = 0;
+      while (pos < len) 
+        {
+          g_input_stream_read_async (stream, buffer, chunk_size,
+                                    G_PRIORITY_DEFAULT, NULL,
+                                    async_read_chunk, &bytes_read);
+         g_main_loop_run (loop);
+
+          g_assert_cmpint (bytes_read, ==, MIN (chunk_size, len - pos));
+          g_assert (strncmp (buffer, result + pos, bytes_read) == 0);
+
+          pos += bytes_read;
+        }
+      
+      g_assert_cmpint (pos, ==, len);
+      res = g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, &error);
+      g_assert_cmpint (res, ==, TRUE);
+      g_assert_no_error (error);
+    }
+
+  g_object_unref (stream);
+  g_main_loop_unref (loop);
+}
+
 static void
 test_seek (void)
 {
@@ -137,6 +202,7 @@ main (int   argc,
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/memory-input-stream/read-chunks", test_read_chunks);
+  g_test_add_func ("/memory-input-stream/async", test_async);
   g_test_add_func ("/memory-input-stream/seek", test_seek);
   g_test_add_func ("/memory-input-stream/truncate", test_truncate);