Fixes for erros in java hextile/zrle decoders

Various errors exposed when connecting to RealVNC servers
on alternative platforms (ARM, SPARC).  SSLEngineManager
was also cleaned up but most of the changes are cosmetic.

1 files changed, 26 insertions, 26 deletions

diff --git a/java/com/tigervnc/rdr/ZlibInStream.java b/java/com/tigervnc/rdr/ZlibInStream.java
index 151633ec..12de0e8b 100644
--- a/java/com/tigervnc/rdr/ZlibInStream.java
+++ b/java/com/tigervnc/rdr/ZlibInStream.java
@@ -33,28 +33,12 @@ public class ZlibInStream extends InStream {
     bufSize = bufSize_;
     b = new byte[bufSize];
     bytesIn = offset = 0;
-    zs = new ZStream();
-    zs.next_in = null;
-    zs.next_in_index = 0;
-    zs.avail_in = 0;
-    if (zs.inflateInit() != JZlib.Z_OK) {
-      zs = null;
-      throw new Exception("ZlinInStream: inflateInit failed");
-    }
     ptr = end = start = 0;
+    init();
   }
 
   public ZlibInStream() { this(defaultBufSize); }
 
-  protected void finalize() throws Throwable {
-    try {
-      b = null;
-      zs.inflateEnd();
-    } finally {
-      super.finalize();
-    }
-  }
-
   public void setUnderlying(InStream is, int bytesIn_)
   {
     underlying = is;
@@ -62,6 +46,11 @@ public class ZlibInStream extends InStream {
     ptr = end = start;
   }
 
+  public int pos()
+  {
+    return offset + ptr - start;
+  }
+
   public void removeUnderlying()
   {
     ptr = end = start;
@@ -74,21 +63,32 @@ public class ZlibInStream extends InStream {
     underlying = null;
   }
 
-  public int pos()
+  public void reset()
   {
-    return offset + ptr - start;
+    deinit();
+    init();
   }
 
-  public void reset()
+  public void init()
   {
-    ptr = end = start;
-    if (underlying == null) return;
+    assert(zs == null);
 
-    while (bytesIn > 0) {
-      decompress(true);
-      end = start; // throw away any data
+    zs = new ZStream();
+    zs.next_in = null;
+    zs.next_in_index = 0;
+    zs.avail_in = 0;
+    if (zs.inflateInit() != JZlib.Z_OK) {
+      zs = null;
+      throw new Exception("ZlinInStream: inflateInit failed");
     }
-    underlying = null;
+  }
+
+  public void deinit()
+  {
+    assert(zs != null);
+    removeUnderlying();
+    zs.inflateEnd();
+    zs = null;
   }
 
   protected int overrun(int itemSize, int nItems, boolean wait)