aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-07 08:04:29 +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:05:13 +09:00
parent cd051d4093
commit 5399c04dff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Data/IHasBlobExtensions.cs
View File

@@ -62,7 +62,7 @@ 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>();
return JObject.Parse(ZipUtils.Unzip(data.Blob)).ToObject<B>(JsonSerializer.CreateDefault(settings ?? DefaultSerializer));
#pragma warning restore CS0618 // Type or member is obsolete
return default;
}
@@ -73,7 +73,7 @@ namespace BTCPayServer.Data
return JObject.Parse(data.Blob2).ToObject(data.Type, 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(data.Type);
return JObject.Parse(ZipUtils.Unzip(data.Blob)).ToObject(data.Type, JsonSerializer.CreateDefault(settings ?? DefaultSerializer));
#pragma warning restore CS0618 // Type or member is obsolete
return default;
}