From 0c49dd592f8b2f56e02eaab8464e97fd9d14c106 Mon Sep 17 00:00:00 2001 From: Bahar Pourazar Date: Tue, 17 Dec 2024 17:35:44 +0000 Subject: [PATCH 1/2] bring back to_s.to_str --- lib/liquid/tokenizer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/liquid/tokenizer.rb b/lib/liquid/tokenizer.rb index cccdbf215..740f85999 100644 --- a/lib/liquid/tokenizer.rb +++ b/lib/liquid/tokenizer.rb @@ -5,7 +5,7 @@ class Tokenizer attr_reader :line_number, :for_liquid_tag def initialize(source, line_numbers = false, line_number: nil, for_liquid_tag: false) - @source = source.to_s + @source = source.to_s.to_str @line_number = line_number || (line_numbers ? 1 : nil) @for_liquid_tag = for_liquid_tag @offset = 0 From 60701f865d9a87437c79f4055123fef178b81310 Mon Sep 17 00:00:00 2001 From: Bahar Pourazar Date: Tue, 17 Dec 2024 16:51:26 +0000 Subject: [PATCH 2/2] Bump version patch --- History.md | 7 +++++++ lib/liquid/version.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 7d94db602..9414dd7af 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,12 @@ # Liquid Change Log +## 5.6.0 (unreleased) + +### Fixes + +* Fix Tokenizer to handle null source value (#1873) [Bahar Pourazar] + + ## 5.5.0 2024-03-21 Please reference the GitHub release for more information. diff --git a/lib/liquid/version.rb b/lib/liquid/version.rb index 4be6b9775..bc8ab3e56 100644 --- a/lib/liquid/version.rb +++ b/lib/liquid/version.rb @@ -2,5 +2,5 @@ # frozen_string_literal: true module Liquid - VERSION = "5.6.0.rc2" + VERSION = "5.6.0.rc3" end