ZipOutputStream.java (write_entry): Fixed SIGSEV caused by use of the wrong instance...

2000-02-28  Mo DeJong  <mdejong@cygnus.com>

	* java/util/zip/ZipOutputStream.java(write_entry) : Fixed
	SIGSEV caused by use of the wrong instance variable.

From-SVN: r32256

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 70dcc678be960f3cc6dc2defb42bd61417306c79..99d822a9f2a309d1fce75022af5a748d38898fa0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-28  Mo DeJong  <mdejong@cygnus.com>
+
+       * java/util/zip/ZipOutputStream.java(write_entry) : Fixed
+       SIGSEV caused by use of the wrong instance variable.
+
 2000-02-27  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java/io/File.java (File(String, String)): For dirPath, treat an

diff --git a/libjava/java/util/zip/ZipOutputStream.java b/libjava/java/util/zip/ZipOutputStream.java
index 956251fd72ea586e930acf7c2c9db23a33a5f056..7c265ac1c631a3c79d6e4c710ff53c84de2f2f55 100644 (file)
--- a/libjava/java/util/zip/ZipOutputStream.java
+++ b/libjava/java/util/zip/ZipOutputStream.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -104,8 +104,8 @@ public class ZipOutputStream extends DeflaterOutputStream
 
     boolean crc_after = false;
     if (is_local
-       && (current.getCrc() == -1 || current.getCompressedSize() == -1
-           || current.getSize() == -1))
+       && (entry.getCrc() == -1 || entry.getCompressedSize() == -1
+           || entry.getSize() == -1))
       crc_after = true;
     // For the bits field we always indicate `normal' compression,
     // even if that isn't true.