[atril] 01/01: 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]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository atril.

commit 2a29b3454a63494364d87f540fabc6a5a531487b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 9 09:25:11 2015 +0100

    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).
---
 debian/patches/0002_forgotten-mutex-unlock.patch | 28 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/0002_forgotten-mutex-unlock.patch b/debian/patches/0002_forgotten-mutex-unlock.patch
new file mode 100644
index 0000000..4cb041a
--- /dev/null
+++ b/debian/patches/0002_forgotten-mutex-unlock.patch
@@ -0,0 +1,28 @@
+From e97dcef7bb3fa143181a68b36eaa3fb02c814d32 Mon Sep 17 00:00:00 2001
+From: monsta <monsta at 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 --git a/debian/patches/series b/debian/patches/series
index 586cb5d..71bdb07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_open-multiple-files.patch
+0002_forgotten-mutex-unlock.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/atril.git