From bdd10db3652b63c24caf8d8ab626fdbb31152fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Tue, 2 Dec 2014 08:46:10 +0200
Subject: main/quvi: fix memory corruption

---
 main/quvi/APKBUILD                | 16 +++++++++++-----
 main/quvi/fix-memcorruption.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 main/quvi/fix-memcorruption.patch

(limited to 'main/quvi')

diff --git a/main/quvi/APKBUILD b/main/quvi/APKBUILD
index 98100dc926..a020f8c12f 100644
--- a/main/quvi/APKBUILD
+++ b/main/quvi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quvi
 pkgver=0.9.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Command line tool for parsing video download links"
 url="http://quvi.sourceforge.net/"
 arch="all"
@@ -12,7 +12,9 @@ depends_dev="libquvi-dev zlib-dev openssl-dev"
 makedepends="$depends_dev glib-dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/project/quvi/${pkgver%.*}/quvi/quvi-$pkgver.tar.xz"
+source="http://downloads.sourceforge.net/project/quvi/${pkgver%.*}/quvi/quvi-$pkgver.tar.xz
+	fix-memcorruption.patch
+	"
 
 _builddir="$srcdir"/quvi-$pkgver
 prepare() {
@@ -28,6 +30,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
+	CFLAGS="$CFLAGS -g" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -45,6 +48,9 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="baa1d7b25e9fd173e952e27d4aa4b933  quvi-0.9.5.tar.xz"
-sha256sums="cb3918aad990b9bc49828a5071159646247199a63de0dd4c706adc5c8cd0a2c0  quvi-0.9.5.tar.xz"
-sha512sums="ef50160b7f2b6b8c9049eb995cb26da3100b10e7af8206d98d2e128cde300ceb05a24dded06d7d49c0e691fcc2de5a4c5c9e9f439d40ca52cd0a3a24330c6d79  quvi-0.9.5.tar.xz"
+md5sums="baa1d7b25e9fd173e952e27d4aa4b933  quvi-0.9.5.tar.xz
+5e424b2a18afc00afbd99a81918c702a  fix-memcorruption.patch"
+sha256sums="cb3918aad990b9bc49828a5071159646247199a63de0dd4c706adc5c8cd0a2c0  quvi-0.9.5.tar.xz
+0be40d52af769e1cffa387c6a77efab099b5b60affb93ff0270a234b95c43222  fix-memcorruption.patch"
+sha512sums="ef50160b7f2b6b8c9049eb995cb26da3100b10e7af8206d98d2e128cde300ceb05a24dded06d7d49c0e691fcc2de5a4c5c9e9f439d40ca52cd0a3a24330c6d79  quvi-0.9.5.tar.xz
+81984ac85b7346fe448455f16b561d483159843e92fe46803b737f688e5d6c9174c11d90b3071c0d000e9fe95547502bf9461240652da4f792ce5ccca46af794  fix-memcorruption.patch"
diff --git a/main/quvi/fix-memcorruption.patch b/main/quvi/fix-memcorruption.patch
new file mode 100644
index 0000000000..4ffe254503
--- /dev/null
+++ b/main/quvi/fix-memcorruption.patch
@@ -0,0 +1,28 @@
+diff -ru quvi-0.9.5.orig/src/util/regex.c quvi-0.9.5/src/util/regex.c
+--- quvi-0.9.5.orig/src/util/regex.c	2013-07-16 17:55:23.000000000 -0300
++++ quvi-0.9.5/src/util/regex.c	2014-12-02 08:41:56.003383594 -0200
+@@ -194,9 +194,8 @@
+   g_free(op->sequence);
+   g_free(op->regex);
+   g_free(op->mode);
+-  g_free(op);
+-
+   memset(op, 0, sizeof(struct _lutil_regex_op_s));
++  g_free(op);
+ }
+ 
+ static gchar *_op_m(lutil_regex_op_t op, const gchar *s)
+diff -ru quvi-0.9.5.orig/src/util/xchg.c quvi-0.9.5/src/util/xchg.c
+--- quvi-0.9.5.orig/src/util/xchg.c	2013-11-10 09:58:30.000000000 -0200
++++ quvi-0.9.5/src/util/xchg.c	2014-12-02 08:42:55.756717512 -0200
+@@ -260,9 +260,8 @@
+ 
+   g_hash_table_destroy(p->htable);
+   g_regex_unref(p->re);
+-  g_free(p);
+-
+   memset(p, 0, sizeof(struct _lutil_xchg_seq_s));
++  g_free(p);
+ }
+ 
+ /* Replace the sequences in the given string (g_free the returned string). */
-- 
cgit v1.2.3