[SCM] libdvdnav/master: debian/patches/: new patchset started

mfv at users.alioth.debian.org mfv at users.alioth.debian.org
Wed Dec 31 08:44:49 UTC 2014


The following commit has been merged in the master branch:
commit 525cd73b16dfff5032293d57aad5a0ac840093e4
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Wed Dec 31 09:25:07 2014 +0100

    debian/patches/: new patchset started
    
    - 0001-dvdnav_get_position.patch added
    
    Closes: #763279

diff --git a/debian/patches/0001-dvdnav_get_position.patch b/debian/patches/0001-dvdnav_get_position.patch
new file mode 100644
index 0000000..8c3885d
--- /dev/null
+++ b/debian/patches/0001-dvdnav_get_position.patch
@@ -0,0 +1,26 @@
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sun, 31 Aug 2014 00:51:40 +0200
+Subject: dvdnav_get_position
+
+Return an error in dvdnav_get_position instead of asserting.
+
+Closes: #763279
+LP: #1236939
+---
+ src/searching.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/searching.c b/src/searching.c
+index f6e497e..74a16ee 100644
+--- a/src/searching.c
++++ b/src/searching.c
+@@ -563,7 +563,8 @@ dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos,
+     *len += cell->last_sector - cell->first_sector + 1;
+   }
+ 
+-  assert((signed)*pos != -1);
++  if((signed)*pos == -1)
++    return DVDNAV_STATUS_ERR;
+ 
+   pthread_mutex_unlock(&this->vm_lock);
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..761cde7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-dvdnav_get_position.patch

-- 
libdvdnav packaging



More information about the pkg-multimedia-commits mailing list