aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Backport of fix for CVE-2015-0973 to libpng 1.2.HEADmasterNarayan Kamath2015-10-181-22/+56
| | | | | | | | | This code hasn't changed very much between 1.2 (klp-dev) and 1.5 / 1.6, except for some rearrangement of checks. bug: 19499430 Change-Id: I5cc708f8952c48296cab7cb37c1649c438d0ad86
* external: libpng: fix numerous compiler warningscarvsdriver2013-07-139-18/+23
| | | | | | | Clean up the code for unused variables to handle them a bit more elegantly. Change-Id: I8b01c27673128719dad74276599d5a286c4dd412
* Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-183-60/+15
|\ | | | | | | | | | | https://android.googlesource.com/platform/external/libpng into mr1-staging Change-Id: I47ac09bc237a707c0f744e7757c89f0c83744602
| * Switch back to LOCAL_CLANG with -std=gnu89.Stephen Hines2012-08-031-2/+2
| | | | | | | | | | | | | | | | The root issue here is that Clang was defaulting to gnu99, which has different semantics for inline functions (that are not in fact bugs). Switching back to gnu89 (like gcc was defaulting to) resolves the link problem. Change-Id: I4fa786aff18ef3f435f83b4a5f1a3ee9dc039432
| * Fix build: Should use prebuilt version of clang instead of platform one.Shih-wei Liao2012-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform version of llvm needs to be upgraded regularly for platform bug fixes and platform improvement in general. The new version of platform clang doesn't handle gnu_inline attribute 100%. We should use prebuilt toolchain for compiler for libpng. We can turn back on LOCAL_CLANG after it is properly implemented, using prebuilt. Currently, libpng.git is the only project that runs into gnu_inline problem. We have to turn off wrong dependency on the platform clang only here. Change-Id: I22429323e797ed6142e72f91a351ace3fdda3fc8
| * Merge "Add signed integer overflow checking to libpng."Geremy Condra2012-06-122-36/+15
| |\
| | * Add signed integer overflow checking to libpng.Geremy Condra2012-06-122-36/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves libpng over to Clang in order to take advantage of its stronger -ftrapv option, causing the code to abort rather than allowing a signed integer overflow. This change depends on Ida05e2d746a88913fc354224a7c660f7570e3adc and I463217aef573a28069469514ad94cd85a7f38bea. Change-Id: I03e6d217fc01ee6429a9a4d5d593379e06c4ef29
| * | This change appears to break skia, but I'm not convinced that its because ↵Geremy Condra2012-06-061-2/+4
| | | | | | | | | | | | | | | skia and libpng were working correctly in the first place. Reverting pending a better understanding of the issue. This reverts commit 1baa2e21111fb8cdc3d8c1fe5179975709913213
| * | Add signed integer overflow checking to libpng.Geremy Condra2012-06-051-4/+2
| |/ | | | | | | | | | | | | | | This change moves libpng over to Clang in order to take advantage of its stronger -ftrapv option, causing the code to abort rather than allowing a signed integer overflow. Change-Id: Ia9573f41f3d14ac3123be1e2c7b17cc8338c69b8
| * Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-10/+0
| | | | | | | | Change-Id: Ie57d52be7d51a1182c72632ed99eaff3934da88b
* | VeNum optimizations to libpng to improve PNG decode timeDinesh K Garg2012-07-105-10/+1220
|/ | | | | | | | | | | | Set correct counter in neon routine for SUB filter type. Enable Neon optimizations for all filter types and pixel depths. Change-Id: Ica0d39e828a9e0cba59cbc3632830e4eb3e59607 (cherry picked from commit b912f64bc4bb174fc055cda58e303faaa640b8b1) Conflicts: pngrutil.c
* Merge "Revise png_set_text_2() to avoid potential memory corruption (fixes ↵Geremy Condra2012-04-231-4/+14
|\ | | | | | | CVE-2011-3048)"
| * Revise png_set_text_2() to avoid potential memory corruption (fixes ↵Terry Heo (Woncheol)2012-04-201-4/+14
| | | | | | | | | | | | | | CVE-2011-3048) Bug: 6343606 Change-Id: I654fa367c4c3122bba1f99a495e680b75b2db978
* | am e2146085: (-s ours) am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for ↵Geremy Condra2012-04-120-0/+0
|\ \ | | | | | | | | | | | | | | | | | | CVE-2011-3045" into ics-mr1 * commit 'e21460858932813a0873f96e1ddc2bc6f36d7c56': DO NOT MERGE Fix for CVE-2011-3045
| * \ am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1Geremy Condra2012-04-120-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit 'b4e0b528f5c1856d8d03caff5b47c8a5b4b905b9': DO NOT MERGE Fix for CVE-2011-3045
| | * \ Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1Geremy Condra2012-04-121-2/+2
| | |\ \
| | | * | DO NOT MERGE Fix for CVE-2011-3045Geremy Condra2012-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia46a262f8c73ec8ad6634c5de5f776373c330061
* | | | | Merge "Fix for CVE-2011-3045"Geremy Condra2012-04-101-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix for CVE-2011-3045Geremy Condra2012-03-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia46a262f8c73ec8ad6634c5de5f776373c330061
* | | | | am 004865ac: (-s ours) am 07fde26d: DO NOT MERGE Fix for CVE-2011-3026Dave Burke2012-04-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '004865ac74c217ae1cd5631559223a399eb3befe': DO NOT MERGE Fix for CVE-2011-3026
| * | | | am 07fde26d: DO NOT MERGE Fix for CVE-2011-3026Dave Burke2012-04-041-2/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '07fde26d99f1da11fc514b2aeef7ae0620f85a63': DO NOT MERGE Fix for CVE-2011-3026
| | * | | DO NOT MERGE Fix for CVE-2011-3026Dave Burke2012-03-151-2/+8
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6085440 Note that this fix was borrowed from chromium and that the issue was fixed in 1.2.47 of libpng (using a different approach). Cherry pick from ccee121fae4c60a5dee6fce51195185694c376c3 Change-Id: I65f4ad400563f7e27ee73872f9c16f3ae4c8644d
* | | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ | | |/ | |/|
| | * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\
| | | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ | | |/ / | |/| / | | |/
| | * am 17b24482: Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-08-040-0/+0
| | |\ | | |/ | |/| | | | | | | * commit '17b24482db9fb75020b91a9c17f2014beebc86ed': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
| | * am bf601c7c: (-s ours) am 358907eb: (-s ours) am 3c3a7e1f: (-s ours) am ↵Eric Vannier2011-07-290-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 791d8f2e: Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE * commit 'bf601c7c40a31c3789a45128d217fab0ecc45115': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
| | * \ am 84d92c71: (-s ours) am 615c9ab0: (-s ours) Upgrading libpng to 1.2.46 to ↵Eric Vannier2011-07-260-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix a few vulnerabilities. DO NOT MERGE * commit '84d92c718ab9f48faec0f640747c4b6f7a995607': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
* | | | | Fix for CVE-2011-3026Dave Burke2012-03-061-2/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | Note that this fix was borrowed from chromium and that the issue was fixed in 1.2.47 of libpng (using a different approach). Change-Id: I9aef05b1b0efd48de8f8121d206257b3c7efb522
| | | |
| \ \ \
*-. \ \ \ Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-08-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | Change-Id: Ib4073e5060f6e9981a31ad5671a21bd930f403f4
| * | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGEEric Vannier2011-08-0259-166/+3486
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5057432 Bug: 5055636 Change-Id: I2ead2a58289c9f01ef2b7d0d557843fffaeb6d1e
* | | | am 358907eb: (-s ours) am 3c3a7e1f: (-s ours) am 791d8f2e: Upgrading libpng ↵Eric Vannier2011-07-290-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE * commit '358907eb39a40fc6b59289f0f092c09e70085db2': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
| * | | am 3c3a7e1f: (-s ours) am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few ↵Eric Vannier2011-07-290-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vulnerabilities. DO NOT MERGE * commit '3c3a7e1f0fbff859b3aaff19069aee5d623a1f75': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
| | * \ \ am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT ↵Eric Vannier2011-07-2959-166/+3486
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE * commit '791d8f2ed98581c67bf9c1ad56d3140719c1882a': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
| | | * | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGEEric Vannier2011-07-2159-166/+3486
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5057432 Bug: 5055636 Change-Id: I2ead2a58289c9f01ef2b7d0d557843fffaeb6d1e
* | | | | am 615c9ab0: (-s ours) Upgrading libpng to 1.2.46 to fix a few ↵Eric Vannier2011-07-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | vulnerabilities. DO NOT MERGE * commit '615c9ab066b4c05d109ffd4a1ce4f715edaf547a': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE
| * | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGEEric Vannier2011-07-2559-166/+3486
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5057432 Bug: 5055636 Change-Id: I768f4b866775b87f7b8939ff3cc760a185207539
* | | | Upgrading libpng to 1.2.46 to fix a few vulnerabilities.Eric Vannier2011-07-2159-166/+3486
|/ / / | | | | | | | | | | | | | | | Bug: 5057432 Bug: 5055636 Change-Id: I9e1b51881386aa9f574a38abc844e036baef9091
* | | Fix infinite loop in decoding a broken PNG.Wei-Ta Chen2011-03-161-4/+9
|/ / | | | | | | | | Bug: 2982500 Change-Id: Ia971f7dfeffc3ccc30385b7b9c4f00394c8521ad
* | Merge "Fix libpng build under cygwin"Raphael Moll2011-02-111-4/+12
|\ \
| * | Fix libpng build under cygwinRaphael Moll2011-02-091-4/+12
|/ / | | | | | | Change-Id: I84afb43d6b18023131aaf411dd958df0e2c75b08
* | am 1e0a1b89: Merge "libpng: use GCC visibility to reduce shared library size"David Turner2010-12-072-2/+7
|\ \ | |/ |/| | | | | * commit '1e0a1b89d72d527a388ea66a298c06f22da39f42': libpng: use GCC visibility to reduce shared library size
| * Merge "libpng: use GCC visibility to reduce shared library size"David Turner2010-12-072-2/+7
| |\
| | * libpng: use GCC visibility to reduce shared library sizeJim Huang2010-08-082-2/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change introduced the implementation for macro PNG_IMPEXP by using GCC visibility in defaulting of "hidden" attribute. Experiment on HTC Passion: target file; out/target/product/passion/system/lib/libskia.so (libpng was statically linked to libskia.so) before: 1117888 bytes after: 1113780 bytes Code size reduction = 4108 bytes Change-Id: I9b718a6a5710268dbb945feea3b64ca3fa393b94
* | Add the feature of tile-based decoding to PNG.Joseph Wen2010-09-095-5/+338
| | | | | | | | | | | | | | There is a relevant patch to the change in zlib: https://android-git.corp.google.com/g/#change,63173 Change-Id: I617b8740a50af0d75df9f49fa6b88dd2decb36dd
* | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|/ | | | Change-Id: I6faf8289e32a61ea02ff551bc3e3b6b500d0d7cd
* Upgrade libpng to 1.2.44 for security fixes.Patrick Scott2010-06-28113-3104/+23714
| | | | Change-Id: Iae257ca6ea7031a99f38e9de196d71ef8b94f9aa
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: I7593b904ef369e046f78c2bd4fa20a779dfa4a7f
* reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
generated by cgit v1.1 at 2024-05-05 16:30:30 +0000