[SCM] libbluray/master: Fix crash for empty disc

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 93c6aff3d369ecc815eeafcd5cb20785c477a112
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 13 23:12:04 2015 +0200

    Fix crash for empty disc
    
    Closes: #785159

diff --git a/debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch b/debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch
new file mode 100644
index 0000000..ef7f526
--- /dev/null
+++ b/debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch
@@ -0,0 +1,21 @@
+Description: bd_open(): return NULL if disc root is NULL
+ Fixes crash when disc files are accessed later.
+Origin: upstream,
+ http://git.videolan.org/?p=libbluray.git;a=commit;h=ac97f9c02ab9b939712fae5e8798c40952624580
+Last-Update: 2015-05-13
+Bug-Debian: https://bugs.debian.org/785159
+
+--- a/src/libbluray/bluray.c
++++ b/src/libbluray/bluray.c
+@@ -1362,7 +1362,10 @@
+         return NULL;
+     }
+ 
+-    bd_open_disc(bd, device_path, keyfile_path);
++    if (!bd_open_disc(bd, device_path, keyfile_path)) {
++        bd_close(bd);
++        return NULL;
++    }
+ 
+     return bd;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index dfdf08d..1afcbb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_online-image.patch
 03_split-jar-build-for-arch-all.patch
 04_kfreebsd-include.patch
+05_bd_open-return-NULL-if-disc-root-is-NULL.patch

-- 
libbluray packaging