[libbluray-devel] [Git][videolan/libbluray][master] 3 commits: Fix possible null deref

[Petri Hintukainen]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
ff9f21ee by hpi1 at 2019-05-24T09:00:31Z
Fix possible null deref

- - - - -
23462a14 by hpi1 at 2019-05-24T09:04:10Z
Remove unused member

- - - - -
36035679 by hpi1 at 2019-05-24T09:10:59Z
Make event parameter serializable

- - - - -


3 changed files:

- src/libbluray/bdj/java-j2se/java/io/FileInputStream.java
- src/libbluray/bdj/java/javax/tv/util/TVTimerSpec.java
- src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java


Changes:

=====================================
src/libbluray/bdj/java-j2se/java/io/FileInputStream.java
=====================================
@@ -55,9 +55,9 @@ public class FileInputStream extends InputStream
                     getLogger().error("" + e);
                 }
             }
-        }
-        if (name.startsWith("file:")) {
-            System.err.println("ERROR: URL in FileInputStream: " + name);
+            if (name.startsWith("file:")) {
+                System.err.println("ERROR: unresolved URL in FileInputStream: " + name);
+            }
         }
 
         SecurityManager security = System.getSecurityManager();


=====================================
src/libbluray/bdj/java/javax/tv/util/TVTimerSpec.java
=====================================
@@ -20,11 +20,12 @@
 package javax.tv.util;
 
 import java.util.Enumeration;
+import java.io.Serializable;
 import java.util.Vector;
 
 import org.videolan.Logger;
 
-public class TVTimerSpec
+public class TVTimerSpec implements Serializable
 {
     private boolean absolute;
     private boolean regular;
@@ -101,4 +102,6 @@ public class TVTimerSpec
             throw new IllegalArgumentException();
         this.time = time;
     }
+
+    private static final long serialVersionUID = -4714470266350436478L;
 }


=====================================
src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java
=====================================
@@ -22,7 +22,6 @@ package org.havi.ui;
 import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.image.ImageObserver;
-import java.awt.image.ImageProducer;
 import java.net.URL;
 import java.util.ArrayList;
 
@@ -104,7 +103,6 @@ public class HBackgroundImage implements ImageObserver {
         }
     }
 
-    private ImageProducer producer;
     private Image img;
     private ArrayList listeners = new ArrayList();
 }



View it on GitLab: https://code.videolan.org/videolan/libbluray/compare/38bbd8e8b146b602adf92f74a7cf58a8cb000144...36035679db2fab3960e78a8823e92c349620d76d

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/compare/38bbd8e8b146b602adf92f74a7cf58a8cb000144...36035679db2fab3960e78a8823e92c349620d76d
You're receiving this email because of your account on code.videolan.org.