aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMo DeJong <mdejong@cygnus.com>2000-02-29 17:04:35 +0000
committerTom Tromey <tromey@gcc.gnu.org>2000-02-29 17:04:35 +0000
commitf8b7a5d26b0e917273143f5ae76247505e896420 (patch)
tree16ff9e0a6daeb95583eb8dbee0f45af6c8111ec0 /libjava
parent2a6b78095fe6a1a807d4a1f3b0ae3df9c867a663 (diff)
downloadgcc-f8b7a5d26b0e917273143f5ae76247505e896420.zip
gcc-f8b7a5d26b0e917273143f5ae76247505e896420.tar.gz
gcc-f8b7a5d26b0e917273143f5ae76247505e896420.tar.bz2
ZipOutputStream.java (write_entry): Fixed SIGSEV caused by use of the wrong instance variable.
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/util/zip/ZipOutputStream.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 70dcc67..99d822a 100644
--- 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 956251f..7c265ac 100644
--- 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.