summaryrefslogtreecommitdiffstats
path: root/libziparchive
Commit message (Collapse)AuthorAgeFilesLines
* libziparchive: fix issue with a directory with one fileMykola Kondratenko2015-03-193-1/+17
| | | | | | | | | libziparchive fails to iterate some bootanimation archives reporting invalid offset error. This is caused by failure to process a directory with one file (when name_offset + file_name_length == cd_offset). Change-Id: I2733e7f782c14a6fadd5491bb94318ac968df206
* Allocate buffers on the heapDmitriy Ivanov2015-03-121-9/+10
| | | | Change-Id: I96c8a50e8987e8ea77d0766ccf3c619f60377864
* Remove some more gotosDmitriy Ivanov2015-03-061-14/+13
| | | | Change-Id: I9c4b3a5aecf4011653933b051e67605a6feb123f
* Reapply -Wold-style-castDmitriy Ivanov2015-03-062-1/+10
| | | | | | | Added pragmas to disable checks for the method using libz.h macros. Change-Id: I25aa1adf09f3ecff61d8fea6306b24b37990ab46
* Fix build: Remove -Wold-style-castDmitriy Ivanov2015-03-061-1/+0
| | | | | | libz.h has macros using old-style-cast. Change-Id: I48f7d85805c7c34e1453c863da3c9e734a57d479
* Remove some gotosDmitriy Ivanov2015-03-061-13/+8
| | | | Change-Id: I0e162c8e0a700940f4302786b8523e5b2f5e5c27
* Cleanup old-style-cast warningsDmitriy Ivanov2015-03-062-23/+28
| | | | Change-Id: I6e17fd993557cbf78ade787f112794358aee39c8
* Remove unnecessary allocation of FileMapsDmitriy Ivanov2015-03-061-34/+12
| | | | Change-Id: I97bb72b9edeee5b3eff4ffd21a761a1af472a3b5
* Remove useless refCounting from FileMap.Narayan Kamath2015-02-231-5/+3
| | | | | | | | | Nobody ever called acquire() so release() was always equivalent to delete. Just use delete instead so that people can use unique_ptr directly (or shared_ptr if they really want refcounts). Change-Id: I9e3ad5e0f6a4fcc4e02e5a2ff7ef9514fe234415
* Add close_file flag to OpenArchiveFd()Dmitriy Ivanov2015-01-302-5/+29
| | | | | | * We should be able to keep fd alive after CloseArchive() Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* Merge "Reject zip archives whose entry names are not valid UTF-8."Narayan Kamath2014-12-084-5/+128
|\
| * Reject zip archives whose entry names are not valid UTF-8.Narayan Kamath2014-12-084-5/+128
| | | | | | | | | | bug: 18584205 Change-Id: Iaf3e8211dab6a1e3923f7fee6ea7fc693972dba3
* | Clean up libziparchive Android.mkTrevor Drake2014-12-061-6/+0
|/ | | | | | | | | | | | | | | Removed LOCAL_C_INCLUDES which are no longer necessary as zlib now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism. Removed a couple of redundant LOCAL_MODULE entries Tested compiling some of the projects that make use of libziparchive and libziparchive-host using a clean out dir with aosp_flounder-userdebug aosp_arm-eng targets make -j3 libziparchive libandroidfw libartd libart libjavacore libjavacoretests aapt Change-Id: I2988f1b3a62d1df2b5eada4ad39a9246ac1184fb
* Libziparchive: Remove unused variableAndreas Gampe2014-11-241-1/+0
| | | | | | For build-system CFLAGS clean-up, remove unused variable. Change-Id: Icc33cf5d0a5fe9a77c277b100de01b70164cc351
* kill HAVE_PREADYabin Cui2014-11-191-2/+2
| | | | | Bug: 18397613 Change-Id: I3990bd0f95cf38c5a9229180a1ddc699941892fc
* am 7a92d20e: Merge "Clean up some test makefiles."Dan Albert2014-11-051-20/+12
|\ | | | | | | | | * commit '7a92d20ec845c07472eaea7cf14fd0e69df836ef': Clean up some test makefiles.
| * Clean up some test makefiles.Dan Albert2014-11-041-20/+12
| | | | | | | | | | | | | | Needed for building with libc++ as the default STL. Bug: 15193147 Change-Id: I8b462bd288fbea7e0ab182f85ffcbf438afb6aa4
* | am b968d5c8: Merge "Add shared library version of libziparchive."Ian Rogers2014-10-301-2/+15
|\ \ | |/ | | | | | | * commit 'b968d5c8468c9b0707f88f773fae16074e9018cf': Add shared library version of libziparchive.
| * Add shared library version of libziparchive.Ian Rogers2014-10-301-2/+15
| | | | | | | | Change-Id: I9abded3bbff0e7976b1849c73e6978dd10ca84cd
* | am cd1da4e0: Fix toolchain issue for windows build of libziparchive.Xavier Ducrohet2014-10-161-0/+3
|\ \ | |/ |/| | | | | * commit 'cd1da4e04f0eb71a92a586c66acd0e34115608e1': Fix toolchain issue for windows build of libziparchive.
| * Fix toolchain issue for windows build of libziparchive.Xavier Ducrohet2014-10-161-0/+3
| | | | | | | | | | | | | | | | | | | | With mingw 4.8, the new default packed behavior is broken and makes zip archive fails due to unexpected misalignment in CentralDirectoryRecord. This patch uses -mno-ms-bitfields to revert to the old packed behavior. Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
| * Reject zip archives with entry names containing \0.Piotr Jastrzebski2014-08-261-1/+7
| | | | | | | | | | | | | | | | | | | | There should never be a need of an entry name with \0 character. Bug: 16162465 (cherry picked from commit 78271ba97b5d867e3597b7fc2257dd1bbd513b05) Change-Id: I68c72fb45e8ec70eb125cfc887488bc18ba5447d
| * Prevent the accidental closure of fd[0] for missing zip files.Neil Fuller2014-07-282-22/+33
| | | | | | | | | | | | | | (cherry picked from commit b1a113f618561b274ab793e6401416d449c60449) Bug: 16530747 Change-Id: I0d1be3dcadfa5128ffe04cec60f6c998dff61991
* | Merge "Reject zip archives with entry names containing \0."Piotr Jastrzebski2014-08-161-1/+7
|\ \
| * | Reject zip archives with entry names containing \0.Piotr Jastrzebski2014-08-191-1/+7
| | | | | | | | | | | | | | | | | | | | | There should never be a need of an entry name with \0 character. Bug: 16162465 Change-Id: Ia2ec57959280c1bb972c4d59d890c8540c5b9081
* | | Cleanup ziparchivePiotr Jastrzebski2014-08-191-3/+4
|/ / | | | | | | | | | | Addressed review comments from 8e08536108d2b5a7f4f9a4b008987b54602fda18 Change-Id: If576e2d6cc5ad330a7dee66b09663e0c04ea3801
* | Fix win_sdk build by not using vectorPiotr Jastrzebski2014-08-182-12/+20
| | | | | | | | Change-Id: I4e9ee4286ea29e1f5f2ee477525e79bfa16ad9a0
* | Replace char* with ZipEntryName in ziparchive API.Piotr Jastrzebski2014-08-153-48/+86
| | | | | | | | | | | | | | | | | | It's important because entry names can be encoded in UTF-8 and can have \0 character in the middle. Use vector instead of char* for prefix in IterationHandle. Bug: 16162465 Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
* | Revert "Make sure that names of all entries have the same encoding."Piotr Jastrzebski2014-08-131-20/+1
| | | | | | | | | | | | This reverts commit 6a7f4bb79dde575d30af562af916b572b80ff9c3. Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
* | Make sure that names of all entries have the same encoding.Piotr Jastrzebski2014-08-131-1/+20
| | | | | | | | | | | | | | | | Add new public method to allow checkisc if an archive has entry names encoded in UTF-8. If not then they will be encoded in IBM PC character encoding. Bug: 16162465 Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
* | Make a copy of a prefix param in StartIterationPiotr Jastrzebski2014-08-111-1/+7
| | | | | | | | | | | | and delete it in EndIteration. Change-Id: I4de4167700a9dba3119fde22fcd45725742f3731
* | Add EndIteration method to free memory allocatedPiotr Jastrzebski2014-08-111-0/+6
| | | | | | | | | | | | | | in StartIteration. This method should always be called when the iteration is over to make sure that we don't leak memory. Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
* | Merge "Prevent the accidental closure of fd[0] for missing zip files."Neil Fuller2014-07-232-22/+33
|\ \
| * | Prevent the accidental closure of fd[0] for missing zip files.Neil Fuller2014-07-252-22/+33
| |/ | | | | | | | | Bug: 16530747 Change-Id: I3593f2bc4d56a2f91252ea795c90ce3c78e1ec06
* | Update makefiles for host clang.Tim Murray2014-07-241-1/+2
|/ | | | | | bug 16172793 Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
* Enable host multilib for ART testing.Ian Rogers2014-06-171-0/+1
| | | | Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c
* Replace hand written offsets with structures.Narayan Kamath2014-06-102-160/+272
| | | | | | | | | | | | | | Given that all current & future android ABIs are little endian, we can get rid of the explicit conversions from memory regions to little endian data members. Also cleans up a few C style casts that snuck in during several -Werror efforts and fixes temporary file generation on target. bug: 15448202 Change-Id: I4fcbb3c1124cb82c82139d328344e54fc7895353
* Fix build.Narayan Kamath2014-06-061-2/+2
| | | | | | Uncommitted changes from a rename. Change-Id: If1cac7104c436970f905eede683040ae79529292
* Reject zip files that have trailing bytes after their CD.Narayan Kamath2014-06-052-12/+38
| | | | | bug: 15287086 Change-Id: I03219c4c2ca6afc9d417a35bd98ae682f478fc25
* Fix host 64-bit build.Ying Wang2014-05-161-2/+2
| | | | | Bug: 13751317 Change-Id: Ib42d24408d053bacc24142ed18fc5f3181d2345b
* libziparchive: off64_t is not int64_t (part deux)Mark Salyzyn2014-05-081-4/+4
| | | | Change-Id: I38e78bdba338a0c40aec43d6c86f26f388cee6ab
* libziparchive: off64_t is not int64_tMark Salyzyn2014-05-081-10/+10
| | | | | | - ToDo: investigate why our system headers let us down. Change-Id: Iada422adbbbd4fbd0fc09b51b97b3cd06ccc6374
* libziparchive: 64 bit issuesMark Salyzyn2014-05-081-12/+13
| | | | Change-Id: I1b53aff5b1527a3623d17deed306624707d345ef
* libziparchive: Turn on -WerrorMark Salyzyn2014-05-072-6/+11
| | | | Change-Id: I98a93273b9e1bac0324dd210f6a8493ba780e878
* libziparchive: 64 bit compile issuesMark Salyzyn2014-03-141-29/+29
| | | | | | - All within LOG messages. Change-Id: I52e81b49e8127276359c62febd4cc1d8d69102d9
* Add free to CloseArchive.Mathieu Chartier2014-03-041-7/+1
| | | | | | | | Currently CloseArchive doesn't call free and call sites don't appear to either. I could not find any call sites which manually freed the archive by deleting the handle. This fixes several memory leaks. Change-Id: I21f187dde60fd87e6e54bde06de9e76fd0791104
* Fix logging errors inside ALOGVColin Cross2014-02-071-1/+1
| | | | | | Fix errors exposed by adding checking to disabled ALOGVs. Change-Id: I36b77bb0ad8dc7661b0f834f20d1179b86134d57
* Fix entry handling for 0 length entries.Narayan Kamath2014-01-242-2/+46
| | | | | | | | | | | | | | | | Two minor issues were fixed: - The offset to entry data can be the same as the central directory offset when the last entry in the file has length 0 and is stored (not deflated). Fix a check that disallowed this. We already have a strict check that entry data must end before the central directory, so we're covered. - We would attempt to map a segment of length 0 when writing an entry whose length is 0. We should just return early in this case. bug: 12623277 Change-Id: I2a4ca0c4d170cc3cbf326e5ca13894acd9c434c9
* Merge "Fix a sporadic build breakage."Elliott Hughes2014-01-031-1/+1
|\
| * Fix a sporadic build breakage.Narayan Kamath2014-01-031-1/+1
| | | | | | | | | | | | | | | | | | The issue here is that the makefile sets LOCAL_LDFLAGS and asks for -llog without declaring a dependency on it. This will cause build breakages if liblog hasn't already been built yet. Change-Id: Ia38761cda44a38b6c2a88902d6108cbe64a328ce