fix: ZipAligner not correctly calculating the file offset

TanNhatCMS · Jun 11, 2022 · 2975a47 · 2975a47
1 parent 0d7581a
commit 2975a47
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/...p/revanced/utils/signing/align/Aligner.kt → ...evanced/utils/signing/align/ZipAligner.kt b/...p/revanced/utils/signing/align/Aligner.kt → ...evanced/utils/signing/align/ZipAligner.kt
@@ -2,6 +2,7 @@ package app.revanced.utils.signing.align
 
 import app.revanced.utils.signing.align.stream.MultiOutputStream
 import app.revanced.utils.signing.align.stream.PeekingFakeStream
+import java.io.BufferedOutputStream
 import java.io.File
 import java.util.*
 import java.util.zip.ZipEntry
@@ -18,7 +19,7 @@ internal object ZipAligner {
  val peekingFakeStream = PeekingFakeStream()
  val fakeOutputStream = ZipOutputStream(peekingFakeStream)
  // real
- val zipOutputStream = ZipOutputStream(output.outputStream())
+ val zipOutputStream = ZipOutputStream(BufferedOutputStream(output.outputStream()))
 
  val multiOutputStream = MultiOutputStream(
  listOf(
@@ -40,8 +41,6 @@ internal object ZipAligner {
  val newOffset = fileOffset + bias
  padding = ((alignment - (newOffset % alignment)) % alignment).toInt()
 
- // fake, used to add the padding, because we add it to real as well in the extra field
- peekingFakeStream.seek(padding.toLong())
  // real
  entry.extra = if (entry.extra == null) ByteArray(padding)
  else Arrays.copyOf(entry.extra, entry.extra.size + padding)

diff --git a/src/main/kotlin/app/revanced/utils/signing/align/stream/MultiOutputStream.kt b/src/main/kotlin/app/revanced/utils/signing/align/stream/MultiOutputStream.kt
@@ -5,21 +5,16 @@ import java.io.OutputStream
 internal class MultiOutputStream(
  private val streams: Iterable<OutputStream>,
 ) : OutputStream() {
- override fun write(b: ByteArray, off: Int, len: Int) {
- streams.forEach {
- it.write(b, off, len)
- }
+ override fun write(b: ByteArray, off: Int, len: Int) = streams.forEach {
+ it.write(b, off, len)
  }
 
- override fun write(b: ByteArray) {
- streams.forEach {
- it.write(b)
- }
+ override fun write(b: ByteArray) = streams.forEach {
+ it.write(b)
  }
 
- override fun write(b: Int) {
- streams.forEach {
- it.write(b)
- }
+ override fun write(b: Int) = streams.forEach {
+ it.write(b)
  }
+
 }
diff --git a/src/main/kotlin/app/revanced/utils/signing/align/stream/PeekingFakeStream.kt b/src/main/kotlin/app/revanced/utils/signing/align/stream/PeekingFakeStream.kt
@@ -2,16 +2,10 @@ package app.revanced.utils.signing.align.stream
 
 import java.io.OutputStream
 
-internal class PeekingFakeStream :  OutputStream() {
+internal class PeekingFakeStream : OutputStream() {
  private var numberOfBytes: Long = 0
 
- fun seek(n: Long) {
- numberOfBytes += n
- }
-
- fun peek(): Long {
- return numberOfBytes
- }
+ fun peek() = numberOfBytes
 
  override fun write(b: Int) {
  numberOfBytes++
@@ -22,6 +16,6 @@ internal class PeekingFakeStream : OutputStream() {
  }
 
  override fun write(b: ByteArray, offset: Int, len: Int) {
- numberOfBytes += len - offset
+ numberOfBytes += len
  }
 }