Bug#780091: unblock (pre-approval): atril/1.8.1+dfsg1-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking planned upload of package atril.
+ * debian/patches:
+ + Add 0002_forgotten-mutex-unlock.patch. Don't forget to unlock the
+ trylock'ed mutex. Prevents from unpredictable behaviour after that
+ mutex unlocking has been forgotten. (Closes: #779848).
-> Prevent from unpredictable behaviour because of forgotten unlock call in
atril's job handling code.
ligh+love,
Mike
unblock atril/1.8.1+dfsg1-4
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
diff -Nru atril-1.8.1+dfsg1/debian/changelog atril-1.8.1+dfsg1/debian/changelog
--- atril-1.8.1+dfsg1/debian/changelog 2014-12-04 12:32:40.000000000 +0100
+++ atril-1.8.1+dfsg1/debian/changelog 2015-03-09 09:27:09.000000000 +0100
@@ -1,3 +1,12 @@
+atril (1.8.1+dfsg1-4) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0002_forgotten-mutex-unlock.patch. Don't forget to unlock the
+ trylock'ed mutex. Prevents from unpredictable behaviour after that
+ mutex unlocking has been forgotten. (Closes: #779848).
+
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 09 Mar 2015 09:26:24 +0100
+
atril (1.8.1+dfsg1-3) unstable; urgency=medium
* debian/patches:
diff -Nru atril-1.8.1+dfsg1/debian/patches/0002_forgotten-mutex-unlock.patch atril-1.8.1+dfsg1/debian/patches/0002_forgotten-mutex-unlock.patch
--- atril-1.8.1+dfsg1/debian/patches/0002_forgotten-mutex-unlock.patch 1970-01-01 01:00:00.000000000 +0100
+++ atril-1.8.1+dfsg1/debian/patches/0002_forgotten-mutex-unlock.patch 2015-03-09 09:22:56.000000000 +0100
@@ -0,0 +1,28 @@
+From e97dcef7bb3fa143181a68b36eaa3fb02c814d32 Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Thu, 5 Mar 2015 17:21:31 +0300
+Subject: [PATCH] ev-jobs: don't forget to unlock the trylock'ed mutex
+
+---
+ libview/ev-jobs.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
+index d8d3043..99cfc8c 100644
+--- a/libview/ev-jobs.c
++++ b/libview/ev-jobs.c
+@@ -834,9 +834,11 @@ ev_job_fonts_run (EvJob *job)
+ /* Do not block the main loop */
+ if (!ev_document_doc_mutex_trylock ())
+ return TRUE;
+-
+- if (!ev_document_fc_mutex_trylock ())
++
++ if (!ev_document_fc_mutex_trylock ()) {
++ ev_document_doc_mutex_unlock ();
+ return TRUE;
++ }
+
+ #ifdef EV_ENABLE_DEBUG
+ /* We use the #ifdef in this case because of the if */
+
diff -Nru atril-1.8.1+dfsg1/debian/patches/series atril-1.8.1+dfsg1/debian/patches/series
--- atril-1.8.1+dfsg1/debian/patches/series 2014-12-04 12:26:34.000000000 +0100
+++ atril-1.8.1+dfsg1/debian/patches/series 2015-03-09 09:23:20.000000000 +0100
@@ -1,2 +1,3 @@
0001_open-multiple-files.patch
+0002_forgotten-mutex-unlock.patch
2001_omit-gfdl-licensed-help-files.patch
Reply to: