Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 04:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix stream reading error.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-04-30 15:04:38 -04:00
parent e4d6f9240f
commit e4ab795c62
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt
View File

@@ -11,6 +11,7 @@ import java.io.FilterInputStream
import java.io.InputStream
import java.security.MessageDigest
import javax.crypto.Mac
import kotlin.math.max
/**
* This is meant as a helper stream to go along with [org.signal.libsignal.protocol.incrementalmac.IncrementalMacInputStream].
@@ -68,7 +69,10 @@ class IncrementalMacAdditionalValidationsInputStream(
// Even though we're reading into the MAC, many of the bytes read in this method call could be non-MAC bytes, so we need to copy
// those over, while excluding the bytes that are part of the MAC.
mac.update(buffer, offset, bytesRead - bytesOfMacRead)
val bytesOfNonMacRead = max(0, bytesRead - bytesOfMacRead)
if (bytesOfNonMacRead > 0) {
mac.update(buffer, offset, bytesOfNonMacRead)
}
} else {
mac.update(buffer, offset, bytesRead)
}