haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checking for empty filter expression

Browse Source
This commit is contained in:
Daniel Gehriger
2019-05-10 11:11:22 +02:00
parent 4e2e124466
commit a394eefe6c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Utility/FilterExpression.cs
+3 -3
View File
@@ -351,7 +351,7 @@ namespace Duplicati.Library.Utility
/// <inheritdoc />
public string GetFilterHash()
{
var hash = MD5HashHelper.GetHash(m_filters.Select(x => x.Filter));
var hash = MD5HashHelper.GetHash(m_filters?.Select(x => x.Filter));
return Utility.ByteArrayAsHexString(hash);
}
@@ -587,9 +587,9 @@ namespace Duplicati.Library.Utility
/// <param name="second">Second.</param>
public static FilterExpression Combine(FilterExpression first, FilterExpression second)
{
if (first == null)
if (first == null || first.Empty)
return second;
if (second == null)
if (second == null || second.Empty)
return first;
if (first.Result != second.Result)
Duplicati/Library/Utility/MD5HashHelper.cs
+6 -3
View File
@@ -50,10 +50,13 @@ namespace Duplicati.Library.Utility
{
using (var md5 = MD5.Create())
{
foreach (var str in inputStrings)
if (inputStrings != null)
{
var inputBuffer = Encoding.UTF8.GetBytes(str);
md5.TransformBlock(inputBuffer, 0, inputBuffer.Length, inputBuffer, 0);
foreach (var str in inputStrings)
{
var inputBuffer = Encoding.UTF8.GetBytes(str);
md5.TransformBlock(inputBuffer, 0, inputBuffer.Length, inputBuffer, 0);
}
}
md5.TransformFinalBlock(new byte[0], 0, 0);