aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaiah Inuwa <isaiah.inuwa@gmail.com>2020-09-23 12:39:25 -0500
committeriinuwa <isaiah.inuwa@gmail.com>2020-09-23 17:48:42 +0000
commit6587f0b0558fd32681608ad1826645eb77899611 (patch)
tree609f397c47da5476953639dc216beb039a667be4
parent1f20eeaf6f10aa0ebb5c6b11be9bfb24ef7b9f7a (diff)
downloadaports-6587f0b0558fd32681608ad1826645eb77899611.tar.gz
aports-6587f0b0558fd32681608ad1826645eb77899611.tar.bz2
aports-6587f0b0558fd32681608ad1826645eb77899611.tar.xz
main/unzip: Fix unsigned overflow patch
-rw-r--r--main/unzip/APKBUILD4
-rw-r--r--main/unzip/unzip-6.0-heap-overflow-infloop.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/main/unzip/APKBUILD b/main/unzip/APKBUILD
index 2e86517177..2fad42a7b4 100644
--- a/main/unzip/APKBUILD
+++ b/main/unzip/APKBUILD
@@ -3,7 +3,7 @@
pkgname=unzip
pkgver=6.0
_pkgver=${pkgver//./}
-pkgrel=7
+pkgrel=8
pkgdesc="Extract PKZIP-compatible .zip files"
url="http://www.info-zip.org/UnZip.html"
arch="all"
@@ -59,7 +59,7 @@ package() {
sha512sums="0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d unzip60.tgz
9d2914f22fb0075a2b6f72825c235f46eafd8d47b6fb6fcc8303fc69336e256b15923c002d2615bb6af733344c2315e4a8504d77bae301e10c11d4736faa2c81 10-unzip-handle-pkware-verify.patch
57699582e9056af0817dcb67f8db67e6a1ff8208c137fbebcf559429e5f12b471b75d7e1ef938e5bbb5416074a51ac7342e4ce8057f4bbdcb0bf079b8d7832af 20-unzip-uidgid-fix.patch
-b1e3fac6a787828efaaef8ec7cc52e1573aea27a6f29830af37ec4ba8bcd2a6488c953ab10eee0561c78e82c7401833ef172bebee793405d93632ce788756301 unzip-6.0-heap-overflow-infloop.patch
+b0b745cff474756447e699a13ff003871b33a4f7a24a91150e5a947eba5132fd90fbacf7580379fc13c5f638483b25cbc226f85b9cac9c7662b2f91927eb2bb3 unzip-6.0-heap-overflow-infloop.patch
028a97e781fb4e277df331fd40b848bbc002f1a5ceeb40e74477cf68d2f063ac2623e24afbeddfa0456940ecc7694fdb66ecd031cbcecad63079e8427fb731c9 CVE-2014-8140.patch
3dd21343d6e5ae7d19f2b2f9cf7310eac38dd7f598e1265e247559a48143c9dbffabd9fc0d7aff6d859ec9e646e85c2b7ee00a1b1a2e23bdf96192c22c58b058 CVE-2014-8141.patch
281c524a9adb1c0f1cb861548d96115f55152c1d76adca34bbaabcca410c5aaf5dd53d99360d7ea8ee9d0ab9eb62031cb40c5de4b5ecfd91535ac178cd3e7098 CVE-2014-9636.patch
diff --git a/main/unzip/unzip-6.0-heap-overflow-infloop.patch b/main/unzip/unzip-6.0-heap-overflow-infloop.patch
index 160c512f96..b517c403eb 100644
--- a/main/unzip/unzip-6.0-heap-overflow-infloop.patch
+++ b/main/unzip/unzip-6.0-heap-overflow-infloop.patch
@@ -86,7 +86,7 @@ index 29db027..b9ae667 100644
- if (G.pInfo->encrypted)
+ if (G.pInfo->encrypted) {
-+ if (csiz_decrypted <= 12) {
++ if (csiz_decrypted < 12) {
+ /* handle the error now to prevent unsigned overflow */
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarStringSmall(ErrUnzipNoFile),