[arch-commits] Commit in libdvdnav/trunk (3 files)

[Jan de Groot]

    Date: Thursday, September 10, 2015 @ 09:43:19
  Author: jgc
Revision: 245703

upgpkg: libdvdnav 5.0.3-1

Added:
  libdvdnav/trunk/fix-crash-describe_title.patch
Modified:
  libdvdnav/trunk/PKGBUILD
Deleted:
  libdvdnav/trunk/Fix-reading-DVD-label.patch

--------------------------------+
 Fix-reading-DVD-label.patch    |   27 ---------------------------
 PKGBUILD                       |    8 ++++----
 fix-crash-describe_title.patch |   29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 31 deletions(-)

Deleted: Fix-reading-DVD-label.patch
===================================================================
--- Fix-reading-DVD-label.patch	2015-09-10 07:37:04 UTC (rev 245702)
+++ Fix-reading-DVD-label.patch	2015-09-10 07:43:19 UTC (rev 245703)
@@ -1,27 +0,0 @@
-From 1cdbd6909097cf36f3357a92de482ec9980ae7ed Mon Sep 17 00:00:00 2001
-From: John Stebbins <stebbins at jetheaddev.com>
-Date: Tue, 13 Jan 2015 11:07:03 -0700
-Subject: [PATCH] Fix reading DVD label
-
-This was inadvertently removed with REMAP
----
- src/vm/vm.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/vm/vm.c b/src/vm/vm.c
-index 7e4d594..1e87376 100644
---- a/src/vm/vm.c
-+++ b/src/vm/vm.c
-@@ -402,6 +402,9 @@ int vm_reset(vm_t *vm, const char *dvdroot) {
-       /* return 0; Not really used for now.. */
-     }
-     /* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */
-+    if(dvd_read_name(vm->dvd_name, vm->dvd_serial, dvdroot) != 1) {
-+      fprintf(MSG_OUT, "libdvdnav: vm: dvd_read_name failed\n");
-+    }
-   }
-   if (vm->vmgi) {
-     int i, mask;
--- 
-1.7.10.4
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-10 07:37:04 UTC (rev 245702)
+++ PKGBUILD	2015-09-10 07:43:19 UTC (rev 245703)
@@ -4,7 +4,7 @@
 # contributor Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=libdvdnav
-pkgver=5.0.2
+pkgver=5.0.3
 pkgrel=1
 pkgdesc="The library for xine-dvdnav plugin."
 arch=('i686' 'x86_64')
@@ -13,13 +13,13 @@
 depends=('libdvdread')
 makedepends=('git')
 source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver
-        Fix-reading-DVD-label.patch)
+        fix-crash-describe_title.patch)
 sha256sums=('SKIP'
-            'f4300e3f38cdcb985c8f3c765ad0503350a96b91496c3cd63c7de5a5cb937119')
+            '6a8e9c777dd9dbfa8a7f981796bd7a60412e3a5c7a8400253c567d956412c64b')
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../Fix-reading-DVD-label.patch
+  patch -Np1 -i ../fix-crash-describe_title.patch
   autoreconf -fi
 }
 

Added: fix-crash-describe_title.patch
===================================================================
--- fix-crash-describe_title.patch	                        (rev 0)
+++ fix-crash-describe_title.patch	2015-09-10 07:43:19 UTC (rev 245703)
@@ -0,0 +1,29 @@
+From 8a270d6dd40ac43c98c948fe9d10e5bcb4aa3d41 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Tue, 1 Sep 2015 16:00:59 +0200
+Subject: [PATCH] Fix crashes with some DVDs on describe_title
+
+This is a stop-over, but the actual issue is not fixed
+---
+ src/searching.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/searching.c b/src/searching.c
+index 70c0f85..f638b61 100644
+--- a/src/searching.c
++++ b/src/searching.c
+@@ -644,6 +644,11 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t
+   if(!tmp)
+     goto fail;
+ 
++  if(!ptt) {
++      printerr("ptt NULL");
++      goto fail;
++  }
++
+   length = 0;
+   for(i=0; i<parts; i++) {
+     uint32_t cellnr, endcellnr;
+-- 
+1.7.10.4
+