Update to 0.17.6

This commit is contained in:
Kalev Lember 2016-09-21 12:38:51 +02:00
parent f5bc9e99ea
commit 13ab4c0ac9
4 changed files with 7 additions and 49 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ libgdata-0.6.4.tar.bz2
/libgdata-0.17.3.tar.xz /libgdata-0.17.3.tar.xz
/libgdata-0.17.4.tar.xz /libgdata-0.17.4.tar.xz
/libgdata-0.17.5.tar.xz /libgdata-0.17.5.tar.xz
/libgdata-0.17.6.tar.xz

View File

@ -1,42 +0,0 @@
From 76e12748bd0e519caeeefd6e1ac7ce8086e63059 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 11 Aug 2016 08:58:00 +0200
Subject: [PATCH] core: Fix crashes on zero-length files
reached_eof is set too early and thus it may not be propagated properly
in some cases, which may cause abortion when reading zero-length files.
https://bugzilla.gnome.org/show_bug.cgi?id=769727
---
gdata/gdata-buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gdata/gdata-buffer.c b/gdata/gdata-buffer.c
index c8c1298f00f7..ce40f80f6249 100644
--- a/gdata/gdata-buffer.c
+++ b/gdata/gdata-buffer.c
@@ -231,10 +231,6 @@ gdata_buffer_pop_data (GDataBuffer *self, guint8 *data, gsize length_requested,
g_mutex_lock (&(self->mutex));
- /* Set reached_eof */
- if (reached_eof != NULL)
- *reached_eof = self->reached_eof && length_requested >= self->total_length;
-
if (self->reached_eof == TRUE && length_requested > self->total_length) {
/* Return data up to the EOF */
return_length = self->total_length;
@@ -259,6 +255,10 @@ gdata_buffer_pop_data (GDataBuffer *self, guint8 *data, gsize length_requested,
return_length = length_requested;
}
+ /* Set reached_eof */
+ if (reached_eof != NULL)
+ *reached_eof = self->reached_eof && length_requested >= self->total_length;
+
/* Return if we haven't got any data to pop (i.e. if we were cancelled before even one chunk arrived) */
if (return_length == 0)
goto done;
--
2.5.5

View File

@ -1,6 +1,6 @@
Name: libgdata Name: libgdata
Version: 0.17.5 Version: 0.17.6
Release: 2%{?dist} Release: 1%{?dist}
Summary: Library for the GData protocol Summary: Library for the GData protocol
Group: System Environment/Libraries Group: System Environment/Libraries
@ -8,9 +8,6 @@ License: LGPLv2+
URL: http://live.gnome.org/libgdata URL: http://live.gnome.org/libgdata
Source0: http://download.gnome.org/sources/%{name}/0.17/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/%{name}/0.17/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=769727
Patch0: libgdata-crashes-on-zero-length-files.patch
BuildRequires: gcr-devel BuildRequires: gcr-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gnome-online-accounts-devel BuildRequires: gnome-online-accounts-devel
@ -47,7 +44,6 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure \ %configure \
@ -90,6 +86,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_datadir}/vala/ %{_datadir}/vala/
%changelog %changelog
* Wed Sep 21 2016 Kalev Lember <klember@redhat.com> - 0.17.6-1
- Update to 0.17.6
* Mon Sep 12 2016 Debarshi Ray <rishi@fedoraproject.org> - 0.17.5-2 * Mon Sep 12 2016 Debarshi Ray <rishi@fedoraproject.org> - 0.17.5-2
- Backport fix for crashes with zero-length files (GNOME #769727) - Backport fix for crashes with zero-length files (GNOME #769727)

View File

@ -1 +1 @@
3a1506d2bbdd68a98378312953a02b06 libgdata-0.17.5.tar.xz 7f64e6091c734e722111fde1794b2e10 libgdata-0.17.6.tar.xz