| 613ebea3da2d973bbe6496d6e57eb4c8d75b148e |
21-Aug-2013 |
Kenny Root <kroot@google.com> |
Fix extra and comment ordering in ZipEntry reading
(cherry picked from commit c242577b1569f97f806ef176e4549141df147b78)
Bug: 10424836
Change-Id: I99e6722ef898baa7f9a2d56e84e88aae5a6c9f4a
ipEntryTest.java
|
| 7662decc8f730fa91ea12001d75159a91f928fa0 |
13-Aug-2013 |
Elliott Hughes <enh@google.com> |
am 9bd449c8: am 5098d4f6: Fix build.
* commit '9bd449c8b788bd7e819f3a3c946a4c6127ea30e1':
Fix build.
|
| 9bd449c8b788bd7e819f3a3c946a4c6127ea30e1 |
13-Aug-2013 |
Elliott Hughes <enh@google.com> |
am 5098d4f6: Fix build.
* commit '5098d4f6ac9b6a538306b9e7ff6eb30c718f0407':
Fix build.
|
| 5098d4f6ac9b6a538306b9e7ff6eb30c718f0407 |
13-Aug-2013 |
Elliott Hughes <enh@google.com> |
Fix build.
I included a duplicate copy of a test in the merge of the bumper zip file
patch.
Change-Id: Ic082416671d6c26108b2d9848b57404f14bc3c7f
ipFileTest.java
|
| b70d0551100794ca2687bec0115571f9fab52fe4 |
13-Aug-2013 |
Elliott Hughes <enh@google.com> |
resolved conflicts for merge of 465008a4 to jb-mr2-dev-plus-aosp
Change-Id: Ic74f1a90347998122c69b312cb591ecbf09323de
|
| 15fd7684de1af7d5f9e76d5bb8695c1fda036ad0 |
13-Aug-2013 |
Elliott Hughes <enh@google.com> |
resolved conflicts for merge of 6ee07507 to jb-mr1-dev-plus-aosp
Change-Id: Iea67d0b1dd161ea565d31af29f15ee5c1892915e
|
| 44e8930b48015aacbad027c5a8d9a4c7e00e329e |
06-Aug-2013 |
Elliott Hughes <enh@google.com> |
Bumper ZipFile/ZipEntry backport.
Bug: https://code.google.com/p/android/issues/detail?id=58465
Bug: 8219321
Bug: 8476102
Bug: 8617715
Bug: 9695860
Bug: 9950697
Bug: 10148349
Bug: 10227498
Change-Id: I94c3e9664a429c94c336115618a46283a13996e0
ipFileTest.java
|
| 2450383af2b0e5197f580062106679245c15d786 |
08-Aug-2013 |
Chad Brubaker <cbrubaker@google.com> |
Add test for STORED zip entry stream size
Tests that the size used for the InputStream from ZipFile.getInputStream
is the uncompressed size and not the compressed size.
Bug: 10227498
Change-Id: Ibc98fe0d8f8c4d6067d675d66432a9dbcc5a7b8d
(cherry picked from commit e7f25b341118d89b7353be90c8bc244f3fc87689)
ipFileTest.java
|
| 8405b26225d88812bb336b2b6c0181266768c3f0 |
06-Aug-2013 |
Elliott Hughes <enh@google.com> |
Disallow filenames containing NUL bytes.
C code gets confused by such filenames, and even if we can handle them,
they're a misleading and of questionable utility because a valid pathname
can't contain a NUL byte.
Bug: https://code.google.com/p/android/issues/detail?id=58465
Bug: 10148349
Change-Id: I3f7e1a17c526b6bb5752dae82610125ad2648d54
(cherry picked from commit b1d05573ae20cdd3d5b4e25f905ce44c8f7d5c0e)
ipFileTest.java
|
| 941e382b6191b92fada482e58e2a0378d4552223 |
06-Aug-2013 |
Elliott Hughes <enh@google.com> |
Clean up a test slightly.
Change-Id: I9ac48591069037a51e95bb57eebb868d225caf6d
ipFileTest.java
|
| 5aced732888f8737c9c30ddf6e2e16ee911c4a54 |
11-Jul-2013 |
Elliott Hughes <enh@google.com> |
am c1ee1ac7: am 99663789: am b3e2cc46: am adf25974: am 15a93894: Tests for ZIP sign extension bugs.
* commit 'c1ee1ac7ff5dd966a90b1524232db6406bbd42fd':
Tests for ZIP sign extension bugs.
|
| 15a93894f19b27f3d85b8e3c3de8cff8a33964d3 |
09-Jul-2013 |
Elliott Hughes <enh@google.com> |
Tests for ZIP sign extension bugs.
Bug: 9695860
(cherry picked from commit 406b85296a7ba29d2f480280d2f2a96133f940ec)
Change-Id: If9740163a67c2bccebd46552fbba0518087232ba
ipEntryTest.java
|
| e9de0dc2087de87074a3bb5a6391d9ca1bda79af |
09-Jul-2013 |
Elliott Hughes <enh@google.com> |
am 210b16cc: Merge "Tests for ZIP sign extension bugs."
* commit '210b16cc87df9eae4f1a9360912a16b8d06821ff':
Tests for ZIP sign extension bugs.
|
| 406b85296a7ba29d2f480280d2f2a96133f940ec |
09-Jul-2013 |
Elliott Hughes <enh@google.com> |
Tests for ZIP sign extension bugs.
Bug: 9695860
Change-Id: I61e5a932d73c14b964c44e753c7317b532b51b6d
ipEntryTest.java
|
| dc36678d3ba7d256a79caf6c401e5fcee8b7d30d |
29-Jun-2013 |
Elliott Hughes <enh@google.com> |
am c5cd81d1: Merge "Implement ZipFile.getComment."
* commit 'c5cd81d198a2c8196077af6d544bbe6daf02b421':
Implement ZipFile.getComment.
|
| 820c09bae53d20c5954d544ebc8a6ee8e54abbae |
29-Jun-2013 |
Elliott Hughes <enh@google.com> |
Implement ZipFile.getComment.
Bug: 3484927
Change-Id: I30c30799aed1b3bbd1b2c90825685cea457600d1
ipFileTest.java
|
| d5ff78bee6dcc6428bdbd44f04146f1987e7fb46 |
29-Jun-2013 |
Elliott Hughes <enh@google.com> |
am 52ac4053: Merge "Add syncFlush support to GZIPOutputStream."
* commit '52ac40530506afe4c5a85d370e04ee77e523b1fa':
Add syncFlush support to GZIPOutputStream.
|
| 35f9da25ee063a0d0c32f7246b466cff8e57c9ee |
29-Jun-2013 |
Elliott Hughes <enh@google.com> |
Add syncFlush support to GZIPOutputStream.
Bug: 3484927
Change-Id: I9a2702970fe746b1f6bbbb438e4ce830e916bad4
eflaterOutputStreamTest.java
ZIPOutputStreamTest.java
|
| 51d669984f4a4c721ed1519cca838f0dc29258c6 |
04-Mar-2013 |
Geremy Condra <gcondra@google.com> |
Merge commit '6425eaad' into manualmerge
Change-Id: Iad87f3a194f585618a74338914c8a228e50fa72f
|
| c7bcde8fbc5cff6de0b2581ebf7398c83e999410 |
19-Feb-2013 |
Geremy Condra <gcondra@google.com> |
Remove support for duplicate file entries.
Bug: 8219321
Change-Id: Ibc56bea753917c38e1bb20df48aa45fdff39d364
ipFileTest.java
|
| 38cad1eb5cc0c30e034063c14c210912d97acb92 |
19-Feb-2013 |
Geremy Condra <gcondra@google.com> |
Remove support for duplicate file entries.
Bug: 8219321
Change-Id: I4ac47f8facf13afa45799a0d5e20202a0ef5f0c6
ipFileTest.java
|
| 13f30b9167639ad63da1707102db6320e8f76474 |
08-Dec-2012 |
Elliott Hughes <enh@google.com> |
Clean up ZipFile a little, fix a few bugs, and improve the documentation.
The main bug fixed is fixing support for .zip files larger than 2GiB (where
the central directory offset's top bit is set).
We were checking character counts rather than byte counts in several places
too, which could lead to corrupt zip files.
I've also added a comment to readCentralDirectory because I keep coming back
to this code, wanting to make it lazy, and never remember (until I've done
half the work) why that's not possible.
I've also clarified a lot of the documentation.
Bug: http://code.google.com/p/android/issues/detail?id=36187
Change-Id: Iaa8eadc501ead7c70528bd9063d5893a325dcea1
ipFileTest.java
|
| 02e0e9bce2706f0024e6f51275e2834dfacdb570 |
26-Jul-2012 |
Elliott Hughes <enh@google.com> |
Make ZipFileTest#testHugeZipFile faster, and reduce ZipFile memory usage.
This test was timing out because of unbuffered I/O.
ZipFile was creating an unnecessary byte[] when writing out the central
directory. In the case of these tests, that was an extra 3MiB of heap!
(cherry-picked from a57c521b9d250f909508af771b96c0011676a968.)
Bug: 6481730
Change-Id: I923e563421056c9c0e73246357ccf54d8fb60cdb
ipFileTest.java
|
| a57c521b9d250f909508af771b96c0011676a968 |
26-Jul-2012 |
Elliott Hughes <enh@google.com> |
Make ZipFileTest#testHugeZipFile faster, and reduce ZipFile memory usage.
This test was timing out because of unbuffered I/O.
ZipFile was creating an unnecessary byte[] when writing out the central
directory. In the case of these tests, that was an extra 3MiB of heap!
Bug: 6481730
Change-Id: I75acac35c556ad5fdc8b06bc616c11244d6b6c55
ipFileTest.java
|
| 5e60f2b0a2d9bb5a069fbe5e898fff8520936977 |
24-Jun-2012 |
Brian Muramatsu <btmura@google.com> |
Fix OldAndroidZipStressTest for user builds
The test was trying to create ZipFile instances with ODEX files and
failing so add a FileNameFilter that only returns APK files.
Bug 6721995
Change-Id: Ifadcb993d37f7f08e4864c5ce5e8dc4ed7d439fb
ldAndroidZipStressTest.java
|
| 9f050bd1d16b822532430c897991e27a58605ff5 |
11-Jan-2012 |
Elliott Hughes <enh@google.com> |
Fix an ICS regression with zip files containing >= 32768 entries.
The usual signed/unsigned 16-bit field problem with zip files. In adding a unit
test I also found two other long-standing bugs:
1. We had O(N^2) behavior when adding files. Someone used an List where they
wanted a Set. Fixed by switching that code over to a Set.
2. We were allowing people to create .zip files with > 64Ki entries but
generating a file that would claim to have (entryCount & 0xffff) entries.
Fixed to throw ZipException until we have proper Zip64 support.
Bug: http://code.google.com/p/android/issues/detail?id=23207
Change-Id: Ice9c9790782639ba50e1ca057bc2cf21a945e147
ipFileTest.java
|
| 0647bfed6eda99ad77b2dfe8e3696e3fabfaf3cc |
13-Dec-2011 |
Jesse Wilson <jessewilson@google.com> |
Bring more tests from frameworks/base/tests/CoreTests into libcore.
Bug: http://b/3073226
Change-Id: I66f88f2bfaadd39e53b2977606731e8579d880b6
ldAndroidZipStressTest.java
|
| 8601d6b5872167f20f3ab845160ae7f9e0fad94b |
16-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Deflater doc and test tidying
Change-Id: If140c104d5736e41669a20af5606a54ce338d60c
eflaterOutputStreamTest.java
|
| 89267eeebbfe246d75921aec68a0cd84f2391b82 |
16-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
am 13218d63: am 6deb2478: am a321720e: Test for SYNC_FLUSH Deflater
* commit '13218d6395389341b85e0d7e19c1c1511e9367be':
Test for SYNC_FLUSH Deflater
|
| a321720e459ae0d7fc403d112f2e974102a59d9f |
16-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Test for SYNC_FLUSH Deflater
Bug: 4005091
Change-Id: I1cbd95ed4d87966e18a601501d6db6cbb277f25c
eflaterOutputStreamTest.java
|
| 229e34b182b98e1dba15d3dc6341954986ae2b7a |
03-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Removing use of @tests and @Test.* annotations
Change-Id: I89243efdeebe22543c45a2166b634f40c3e78cf8
ldZipFileTest.java
|
| b9f4eb77cf7c5937fcd33d839c749900112874bd |
07-Jan-2011 |
Jesse Wilson <jessewilson@google.com> |
Don't short-circuit Inflater.inflate() on zero-length requests.
Change-Id: I2d207ee16dd432ba4211990da21a345f81375039
http://code.google.com/p/android/issues/detail?id=11755
nflaterTest.java
|
| 990640f1775dc6f429a5f8b9fc6cab6b4220c03a |
15-Dec-2010 |
Jesse Wilson <jessewilson@google.com> |
Move 41 tests to libcore, closer to the tested code.
Change-Id: I0ecaacd0e68b8319806555f71ddf347f01b17be9
http://b/3073226
ldAndroidChecksumTest.java
ldAndroidDeflateTest.java
ldAndroidGZIPStreamTest.java
ldAndroidZipFileTest.java
ldAndroidZipStreamTest.java
|
| aee3e4d2e0a2830fc2ef8e96a13796d012becab2 |
07-Dec-2010 |
Elliott Hughes <enh@google.com> |
Throw better exceptions if an Inflater or Deflater is used after calling end.
Bug: 3217912
Change-Id: I480c92d2f97b530f17b9b8daf2549d2f06384219
nflaterTest.java
|
| 2d9c5fa8ce0182cd8c14736241b709fd50cab6f8 |
23-Nov-2010 |
Elliott Hughes <enh@google.com> |
Slight cleanup of java.util.zip code, plus a bug fix.
The key fix is switching to zstream's next_in and next_out fields (the
pointers into the input and output buffers) rather than relying on the
integer "accounting" fields. If turns out in the Z_NEED_DICT case that
the accounting goes slightly awry. (We shouldn't have been using the
accounting anyway, because we were silently coercing longs to ints.)
The new code is simpler, clearer, and doesn't need a special case for
Z_NEED_DICT at all.
I've also removed yet another hand-written UTF-8 encoder, made Inflater
throw ArrayIndexOutOfBoundsExceptions with useful detail messages (factored
out into Arrays so we can make this change more widely), and
rewritten the Inflater and Deflater documentation.
The unit test reproduces the problem (and tests as many other cases as
it can too). Critical for testing this bug is that we needed to limit
the size of the input buffer so that zlib has to ask us for more input.
Bug: 3220923
Change-Id: I39e5456620eaa7f75d12d885db279f009ee3e8ef
eflaterOutputStreamTest.java
nflaterTest.java
|
| 27495197b6f411df17116022bd0f5458aecd9c84 |
12-Nov-2010 |
Elliott Hughes <enh@google.com> |
A specific test for http://b/3181430.
Bug: 3181430
Change-Id: If1e02a888863143f4c56d1ef57e265d7c7bffcc4
ipOutputStreamTest.java
|
| 55e276b6718282224e0069645da2222beda7b8df |
11-Nov-2010 |
Elliott Hughes <enh@google.com> |
Tests that would have caught my recent ZipInputStream/ZipOutputStream regressions.
Not the best tests in the world, but they would have been sufficient.
Bug: 3181430
Change-Id: Id68f5bb6a2c66f9f5c8c061b34dfeb5d3d63e63e
ipInputStreamTest.java
ipOutputStreamTest.java
|
| 0c7d369eb9cae44596f73cf2f044d59397abab8d |
04-Nov-2010 |
Elliott Hughes <enh@google.com> |
GZIPInputStream/GZIPOutputStream test improvements.
1. Ensure that there's a direct mapping from the class to its test,
so we're more likely to run the right tests. I've broken GzipTest
into two for this.
2. Include actual data rather than always round-tripping, to avoid
potential symmetric errors. (This wasn't important in this case.)
3. Remove a dead file that belonged to a test that's already been
removed.
Bug: 3164285
Change-Id: I312237454eead26d0dbbdb8f6339aa29ed8eea4e
ZIPInputStreamTest.java
ZIPOutputStreamTest.java
zipTest.java
|
| 5d060f399d673f7e4d57c426fc7d87e707c31d5c |
01-Oct-2010 |
Jesse Wilson <jessewilson@google.com> |
am 5df67087: am ff805724: am 16bba11e: Merge "Don\'t use the decompression-buffer as the skip buffer in InflaterInputStream." into gingerbread
Merge commit '5df6708702ddd1405e7d0a39e9f806cefd330028' into dalvik-dev
* commit '5df6708702ddd1405e7d0a39e9f806cefd330028':
Don't use the decompression-buffer as the skip buffer in InflaterInputStream.
|
| 5df6708702ddd1405e7d0a39e9f806cefd330028 |
01-Oct-2010 |
Jesse Wilson <jessewilson@google.com> |
am ff805724: am 16bba11e: Merge "Don\'t use the decompression-buffer as the skip buffer in InflaterInputStream." into gingerbread
Merge commit 'ff8057246a6d43a55c93c9c728a6dddb0d98fcdb'
* commit 'ff8057246a6d43a55c93c9c728a6dddb0d98fcdb':
Don't use the decompression-buffer as the skip buffer in InflaterInputStream.
|
| 3541c79d5058b86e742867b4ee5811a1de01de1f |
30-Sep-2010 |
Jesse Wilson <jessewilson@google.com> |
Don't use the decompression-buffer as the skip buffer in InflaterInputStream.
This has bad consequences for the GzipInputStream subclass, which can't
use the input buffer as a scratch space because it needs to CRC all of
the decompressed data.
Change-Id: I310261dc8ef7a5082768cc6d6a2eff4ef77f5a21
http://b/3042574
zipTest.java
|
| b18d7a024d28fcce3497e2cd8d78642b5d057d45 |
26-Sep-2010 |
Jesse Wilson <jessewilson@google.com> |
Remove zip and jar tests duplicated from Harmony.
Change-Id: I06b18c2197482dbf5b52c72ffa19c87eca16e201
ldDataFormatExceptionTest.java
ldZipExceptionTest.java
ldZipFileTest.java
ldZipInputStreamTest.java
ipFileTest.java
|
| b814b1850f5ed997ea1e7f574c8fc0df6a693c36 |
09-Sep-2010 |
Jesse Wilson <jessewilson@google.com> |
Address test failures in java.util.zip.
Some deflater tests fail because they expect a specific byte sequence in
the compressed form. Our compressed form is valid but has a different
sequence. I've written new tests to cover the related APIs and suppressed
the broken tests.
The other deleted tests are duplicated exactly from Harmony. I'm removing
our copy.
Change-Id: If480d54948e634e4f6b1018da30951a1d4d07b49
eflaterInputStreamTest.java
eflaterTest.java
|
| 355a98498e4bc434dde8809eacf6e150f9b25f89 |
02-Sep-2010 |
Jesse Wilson <jessewilson@google.com> |
Fix a findbugs bug where ZipEntry.clone() didn't call super.clone().
See http://b/2099615
Change-Id: Ib1347aa5e35c62501d9d59eccfdfed098559d552
ipEntryTest.java
|
| 4557728efb66c455a52b7669a8eefef7a9e54854 |
11-Aug-2010 |
Jesse Wilson <jessewilson@google.com> |
Moving tests to be under the libcore.* package.
This is indended to make it easier to run on VMs that restrict the packages
from which application classes can be loaded. For example, on the RI you need
to use the bootclasspath to load these tests.
Change-Id: I52193f35c5fcca18b5a3e1d280505b1e29b388af
eflaterOutputStreamTest.java
eflaterTest.java
ipEntryTest.java
ipFileTest.java
|