aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-06 15:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashing on unserialize of old data

Browse Source
This commit is contained in:
nicolas.dorier
2023-02-26 11:18:54 +09:00
parent 5399c04dff
commit 06334273dc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BTCPayServer/Data/IHasBlobExtensions.cs
View File

@@ -3,6 +3,7 @@ using System;
using System.Collections;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using NBXplorer;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -62,7 +63,14 @@ namespace BTCPayServer.Data
return JObject.Parse(data.Blob2).ToObject<B>(JsonSerializer.CreateDefault(settings ?? DefaultSerializer));
#pragma warning disable CS0618 // Type or member is obsolete
if (data.Blob is not null && data.Blob.Length != 0)
return JObject.Parse(ZipUtils.Unzip(data.Blob)).ToObject<B>(JsonSerializer.CreateDefault(settings ?? DefaultSerializer));
{
string str;
if (data.Blob[0] == 0x7b)
str = Encoding.UTF8.GetString(data.Blob);
else
str = ZipUtils.Unzip(data.Blob);
return JObject.Parse(str).ToObject<B>(JsonSerializer.CreateDefault(settings ?? DefaultSerializer));
}
#pragma warning restore CS0618 // Type or member is obsolete
return default;
}