Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 72831 invoked from network); 4 Aug 2006 08:30:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Aug 2006 08:30:51 -0000 Received: (qmail 34568 invoked by uid 500); 4 Aug 2006 08:30:51 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 34536 invoked by uid 500); 4 Aug 2006 08:30:51 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 34525 invoked by uid 99); 4 Aug 2006 08:30:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 01:30:51 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 01:30:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 91CCB1A981A; Fri, 4 Aug 2006 01:30:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428658 - /incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c Date: Fri, 04 Aug 2006 08:30:29 -0000 To: harmony-commits@incubator.apache.org From: mloenko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060804083030.91CCB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mloenko Date: Fri Aug 4 01:30:28 2006 New Revision: 428658 URL: http://svn.apache.org/viewvc?rev=428658&view=rev Log: applied patch for HARMONY-81 java.util.zip.Inflater.infalate() throws DataFormatException instead of actual number of uncompressed bytes Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c?rev=428658&r1=428657&r2=428658&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c Fri Aug 4 01:30:28 2006 @@ -134,6 +134,9 @@ if (err != Z_OK) { + if(err == Z_STREAM_ERROR) { + return 0; + } if (err == Z_STREAM_END || err == Z_NEED_DICT) { ((*env)->SetIntField (env, recv, fid, (jint) stream->stream->total_in - sin + inBytes)); /* Update inRead */