From 5399c04dff88e6b2b81c8461b82b43329f77c666 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sun, 26 Feb 2023 11:05:13 +0900 Subject: [PATCH] Fix crashing on unserialize of old data --- BTCPayServer/Data/IHasBlobExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BTCPayServer/Data/IHasBlobExtensions.cs b/BTCPayServer/Data/IHasBlobExtensions.cs index 532a159ba..214b34c2a 100644 --- a/BTCPayServer/Data/IHasBlobExtensions.cs +++ b/BTCPayServer/Data/IHasBlobExtensions.cs @@ -62,7 +62,7 @@ namespace BTCPayServer.Data return JObject.Parse(data.Blob2).ToObject(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(); + return JObject.Parse(ZipUtils.Unzip(data.Blob)).ToObject(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; }