[arch-commits] Commit in libsoup/trunk (PKGBUILD cache-control-dontcrash.patch)
Jan de Groot
jgc at archlinux.org
Thu Sep 4 21:04:01 UTC 2014
Date: Thursday, September 4, 2014 @ 23:04:01
Author: jgc
Revision: 220988
upgpkg: libsoup 2.47.4-1
Added:
libsoup/trunk/cache-control-dontcrash.patch
Modified:
libsoup/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 15 +++++++++++----
cache-control-dontcrash.patch | 27 +++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-04 20:58:46 UTC (rev 220987)
+++ PKGBUILD 2014-09-04 21:04:01 UTC (rev 220988)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=libsoup
-pkgver=2.46.0
+pkgver=2.47.4
pkgrel=1
pkgdesc="GNOME HTTP Library"
arch=(i686 x86_64)
@@ -9,15 +9,22 @@
license=(LGPL)
url="http://www.gnome.org"
depends=(glib2 libxml2 glib-networking sqlite)
-makedepends=(intltool gobject-introspection python)
+makedepends=(intltool gobject-introspection python python2)
checkdepends=(apache php php-apache)
provides=("libsoup-gnome=$pkgver-$pkgrel")
conflicts=(libsoup-gnome)
replaces=(libsoup-gnome)
options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ cache-control-dontcrash.patch)
+sha256sums=('2e8c1ea1e47c0c1b17d5fa7eba0ba663e0999f75a9e5fdc2607c2bcd418d4086'
+ 'bba8516f72a295daabda013ed98db44d280732eb77deea312bbaa2486682aa40')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../cache-control-dontcrash.patch
+}
+
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
Added: cache-control-dontcrash.patch
===================================================================
--- cache-control-dontcrash.patch (rev 0)
+++ cache-control-dontcrash.patch 2014-09-04 21:04:01 UTC (rev 220988)
@@ -0,0 +1,27 @@
+From 3520c010c74dd7cc3d11e0ab5d8f07df70a4bfc9 Mon Sep 17 00:00:00 2001
+From: Raveendra Karu <r.karu at samsung.com>
+Date: Wed, 23 Jul 2014 09:04:43 +0530
+Subject: soup-cache: don't crash on invalid Cache-Control header
+
+If a response had a Cache-Control header with a "max-age" attribute
+with no value (which is invalid), SoupCache would end up dereferencing
+a NULL pointer.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=733587
+
+diff --git a/libsoup/soup-cache.c b/libsoup/soup-cache.c
+index c17e537..533a175 100644
+--- a/libsoup/soup-cache.c
++++ b/libsoup/soup-cache.c
+@@ -1155,7 +1155,7 @@ soup_cache_has_response (SoupCache *cache, SoupMessage *msg)
+ return SOUP_CACHE_RESPONSE_STALE;
+ }
+
+- if (g_hash_table_lookup_extended (hash, "max-age", NULL, &value)) {
++ if (g_hash_table_lookup_extended (hash, "max-age", NULL, &value) && value) {
+ max_age = (int)MIN (g_ascii_strtoll (value, NULL, 10), G_MAXINT32);
+ /* Forcing cache revalidaton
+ */
+--
+cgit v0.10.1
+
More information about the arch-commits
mailing list