[libbluray-devel] Fix segfault

[npzacs]

libbluray | branch: master | npzacs <npzacs at gmail.com> | Sat Sep 16 13:43:02 2017 +0300| [c16d40ec82a9bcbeab389cf38584cd801c3c5bc0] | committer: npzacs

Fix segfault

Also log configuration string

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=c16d40ec82a9bcbeab389cf38584cd801c3c5bc0
---

 src/libbluray/bdj/java/org/videolan/Libbluray.java | 6 ++++++
 src/libbluray/disc/bdplus.c                        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libbluray/bdj/java/org/videolan/Libbluray.java b/src/libbluray/bdj/java/org/videolan/Libbluray.java
index 55ee6c94..fa21954f 100644
--- a/src/libbluray/bdj/java/org/videolan/Libbluray.java
+++ b/src/libbluray/bdj/java/org/videolan/Libbluray.java
@@ -187,6 +187,12 @@ public class Libbluray {
         } catch (Throwable t) {
         }
 
+        byte[] type = getAacsData(4096);
+        String pkg = type != null ? new String(type) : null;
+        if (pkg != null) {
+            System.out.println("using " + pkg);
+        }
+
         System.setProperty("mhp.profile.enhanced_broadcast", "YES");
         System.setProperty("mhp.profile.interactive_broadcast", "YES");
         System.setProperty("mhp.profile.internet_access", "YES");
diff --git a/src/libbluray/disc/bdplus.c b/src/libbluray/disc/bdplus.c
index 80048507..a4866b8d 100644
--- a/src/libbluray/disc/bdplus.c
+++ b/src/libbluray/disc/bdplus.c
@@ -262,7 +262,7 @@ const uint8_t *libbdplus_get_data(BD_BDPLUS *p, int type)
 {
     switch (type) {
         case BD_BDPLUS_TYPE:
-            if (libbdplus_is_mmbd(p->bdplus)) {
+            if (libbdplus_is_mmbd(p)) {
                 return (const uint8_t *)"mmbd";
             }
     }