From e889a9da0b5e83887f55ee5539c716bb75f5999f Mon Sep 17 00:00:00 2001
From: Michael Go <michael.go@shopify.com>
Date: Tue, 17 Jan 2023 17:48:16 -0400
Subject: [PATCH] use to_i to parse parameters of tablerow tag

---
 lib/liquid/tags/table_row.rb | 25 +++++++++++--------------
 lib/liquid/utils.rb          |  5 +----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/lib/liquid/tags/table_row.rb b/lib/liquid/tags/table_row.rb
index f404efd6..d52f268a 100644
--- a/lib/liquid/tags/table_row.rb
+++ b/lib/liquid/tags/table_row.rb
@@ -45,24 +45,13 @@ module Liquid
     def render_to_output_buffer(context, output)
       (collection = context.evaluate(@collection_name)) || (return '')
 
-      from = if @attributes.key?('offset')
-        Utils.to_integer(context.evaluate(@attributes['offset']), allow_nil: true)
-      else
-        0
-      end
-
-      to = if @attributes.key?('limit')
-        from + Utils.to_integer(context.evaluate(@attributes['limit']), allow_nil: true)
-      end
+      from = @attributes.key?('offset') ? to_integer(context.evaluate(@attributes['offset'])) : 0
+      to = @attributes.key?('limit') ? from + to_integer(context.evaluate(@attributes['limit'])) : nil
 
       collection = Utils.slice_collection(collection, from, to)
       length     = collection.length
 
-      cols = if @attributes.key?('cols')
-        Utils.to_integer(context.evaluate(@attributes['cols']), allow_nil: true)
-      else
-        length
-      end
+      cols = @attributes.key?('cols') ? to_integer(context.evaluate(@attributes['cols'])) : length
 
       output << "<tr class=\"row1\">\n"
       context.stack do
@@ -93,6 +82,14 @@ module Liquid
         super + @node.attributes.values + [@node.collection_name]
       end
     end
+
+    private
+
+    def to_integer(value)
+      value.to_i
+    rescue NoMethodError
+      raise Liquid::ArgumentError, "invalid integer"
+    end
   end
 
   Template.register_tag('tablerow', TableRow)
diff --git a/lib/liquid/utils.rb b/lib/liquid/utils.rb
index fce8e4c7..4ec7d811 100644
--- a/lib/liquid/utils.rb
+++ b/lib/liquid/utils.rb
@@ -39,11 +39,8 @@ module Liquid
       segments
     end
 
-    def self.to_integer(num, allow_nil: false)
+    def self.to_integer(num)
       return num if num.is_a?(Integer)
-      # with allow_nil param, return 0 which is equal to nil.to_i
-      return 0 if num.nil? && allow_nil
-
       num = num.to_s
       begin
         Integer(num)