rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check binary length #924

Browse Source
This commit is contained in:
J-Jamet
2021-03-15 18:47:36 +01:00
parent 6dc0c42b1e
commit af2df11a56
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryPool.kt
View File

@@ -124,13 +124,15 @@ abstract class BinaryPool<T> {
fun isBinaryDuplicate(binaryFile: BinaryFile?): Boolean { fun isBinaryDuplicate(binaryFile: BinaryFile?): Boolean {
try { try {
binaryFile?.let { binaryFile?.let {
val searchBinaryMD5 = it.md5() if (it.length > 0) {
var i = 0 val searchBinaryMD5 = it.md5()
for ((_, binary) in pool) { var i = 0
if (binary.md5() == searchBinaryMD5) { for ((_, binary) in pool) {
i++ if (binary.md5() == searchBinaryMD5) {
if (i > 1) i++
return true if (i > 1)
return true
}
} }
} }
} }
@@ -166,7 +168,11 @@ abstract class BinaryPool<T> {
// Don't deduplicate // Don't deduplicate
val existentBinary = val existentBinary =
try { try {
keyBinaryList.find { it.binary.md5() == binary.md5() } if (binary.length > 0) {
keyBinaryList.find { it.binary.md5() == binary.md5() }
} else {
null
}
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Unable to check binary MD5", e) Log.e(TAG, "Unable to check binary MD5", e)
null null