[libbluray-devel] Return nul-filled array instead of null

hpi1 git at videolan.org
Thu Apr 30 10:09:52 CEST 2015


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Apr 21 15:02:10 2015 +0300| [50500a12be76ca83190aca1ce9dc196b9436c4fe] | committer: hpi1

Return nul-filled array instead of null

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

 src/libbluray/bdj/java/com/aacsla/bluray/online/MediaAttribute.java |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libbluray/bdj/java/com/aacsla/bluray/online/MediaAttribute.java b/src/libbluray/bdj/java/com/aacsla/bluray/online/MediaAttribute.java
index cec0fb2..62a2d6d 100644
--- a/src/libbluray/bdj/java/com/aacsla/bluray/online/MediaAttribute.java
+++ b/src/libbluray/bdj/java/com/aacsla/bluray/online/MediaAttribute.java
@@ -30,6 +30,7 @@ public class MediaAttribute {
         byte pmsn[] = Libbluray.getAacsData(Libbluray.AACS_MEDIA_PMSN);
         if (pmsn == null) {
             logger.warning("getPMSN() failed");
+            return new byte[16];
         }
         return pmsn;
     }
@@ -38,6 +39,7 @@ public class MediaAttribute {
         byte vid[] = Libbluray.getAacsData(Libbluray.AACS_MEDIA_VID);
         if (vid == null) {
             logger.warning("getVolumeID() failed");
+            return new byte[16];
         }
         return vid;
     }



More information about the libbluray-devel mailing list