From 0b715510de5d8c5f293216d29a8dd653a08b2a18 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 28 Nov 2008 05:57:07 +0000 Subject: [PATCH] =?utf8?q?Bug=20562393=20=E2=80=93=20g=5Fbuffered=5Finput?= =?utf8?q?=5Fstream=5Fread=5Fbyte=20broken=20if=20data=20available?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-11-28 Matthias Clasen Bug 562393 – g_buffered_input_stream_read_byte broken if data available * gio/gbufferedinputstream.c (g_buffered_input_stream_read_byte): Fix handling of buffered content. Patch by Philip Withnall * gio/tests/buffered-input-stream.c: Add a testcase for this bug. * gio/tests/Makefile.am: And build it svn path=/trunk/; revision=7686 --- gio/ChangeLog | 11 +++++++ gio/gbufferedinputstream.c | 2 +- gio/tests/Makefile.am | 6 +++- gio/tests/buffered-input-stream.c | 60 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 gio/tests/buffered-input-stream.c diff --git a/gio/ChangeLog b/gio/ChangeLog index af3503e..a7cb45f 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,5 +1,16 @@ 2008-11-28 Matthias Clasen + Bug 562393 – g_buffered_input_stream_read_byte broken if data + available + + * gio/gbufferedinputstream.c (g_buffered_input_stream_read_byte): Fix + handling of buffered content. Patch by Philip Withnall + + * gio/tests/buffered-input-stream.c: Add a testcase for this bug. + * gio/tests/Makefile.am: And build it + +2008-11-28 Matthias Clasen + Bug 561807 – inotify_sub.c :: dup_dirname() fails to remove trailing '/' diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c index 040ce3b..4ffdff7 100644 --- a/gio/gbufferedinputstream.c +++ b/gio/gbufferedinputstream.c @@ -878,7 +878,7 @@ g_buffered_input_stream_read_byte (GBufferedInputStream *stream, available = priv->end - priv->pos; - if (available < 1) + if (available != 0) { g_input_stream_clear_pending (input_stream); return priv->buffer[priv->pos++]; diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index ea765d2..ee84a4b 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -23,7 +23,8 @@ TEST_PROGS += \ g-file-info \ data-input-stream \ data-output-stream \ - g-icon + g-icon \ + buffered-input-stream if OS_UNIX TEST_PROGS += live-g-file unix-streams desktop-app-info @@ -50,6 +51,9 @@ data_output_stream_LDADD = $(progs_ldadd) g_icon_SOURCES = g-icon.c g_icon_LDADD = $(progs_ldadd) +buffered_input_stream_SOURCES = buffered-input-stream.c +buffered_input_stream_LDADD = $(progs_ldadd) + live_g_file_SOURCES = live-g-file.c live_g_file_LDADD = $(progs_ldadd) diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c new file mode 100644 index 0000000..ceb38b9 --- /dev/null +++ b/gio/tests/buffered-input-stream.c @@ -0,0 +1,60 @@ +/* GLib testing framework examples and tests + * Copyright (C) 2008 Red Hat, Inc. + * Authors: Matthias Clasen + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * In no event shall the authors or contributors be liable for any + * direct, indirect, incidental, special, exemplary, or consequential + * damages (including, but not limited to, procurement of substitute + * goods or services; loss of use, data, or profits; or business + * interruption) however caused and on any theory of liability, whether + * in contract, strict liability, or tort (including negligence or + * otherwise) arising in any way out of the use of this software, even + * if advised of the possibility of such damage. + */ + +#include +#include +#include +#include + +static void +test_read_byte (void) +{ + GInputStream *base; + GInputStream *in; + + g_test_bug ("562393"); + + base = g_memory_input_stream_new_from_data ("abcdefghijk", -1, NULL); + in = g_buffered_input_stream_new (base); + + g_assert_cmpint (g_buffered_input_stream_read_byte (G_BUFFERED_INPUT_STREAM (in), NULL, NULL), ==, 'a'); + g_assert_cmpint (g_buffered_input_stream_read_byte (G_BUFFERED_INPUT_STREAM (in), NULL, NULL), ==, 'b'); + g_assert_cmpint (g_buffered_input_stream_read_byte (G_BUFFERED_INPUT_STREAM (in), NULL, NULL), ==, 'c'); + + g_assert_cmpint (g_input_stream_skip (in, 3, NULL, NULL), ==, 3); + + g_assert_cmpint (g_buffered_input_stream_read_byte (G_BUFFERED_INPUT_STREAM (in), NULL, NULL), ==, 'g'); +} + + +int +main (int argc, + char *argv[]) +{ + g_type_init (); + g_test_init (&argc, &argv, NULL); + g_test_bug_base ("http://bugzilla.gnome.org/"); + + g_test_add_func ("/buffered-input-stream/read-byte", test_read_byte); + + return g_test_run(); +} -- 2.7.4