Update ListSelectorViewController to use safe index accessors (#14077)

woocommerce · Sep 30, 2024 · bc4301b · bc4301b
2 parents 5161e39 + b25ba6a
commit bc4301b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/WooCommerce/Classes/ViewRelated/ListSelector/ListSelectorViewController.swift b/WooCommerce/Classes/ViewRelated/ListSelector/ListSelectorViewController.swift
@@ -89,11 +89,12 @@ UIViewController, UITableViewDataSource, UITableViewDelegate where Command.Model
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(Cell.self, for: indexPath)
-        let model = command.data[indexPath.row]
-        // Configures the cell's `accessoryType` before calling `command.configureCell` so that the command could override the `accessoryType`.
-        cell.accessoryType = command.isSelected(model: model) ? .checkmark: .none
-        command.configureCell(cell: cell, model: model)
 
+        if let model = command.data[safe: indexPath.row] {
+            // Configures the cell's `accessoryType` before calling `command.configureCell` so that the command could override the `accessoryType`.
+            cell.accessoryType = command.isSelected(model: model) ? .checkmark: .none
+            command.configureCell(cell: cell, model: model)
+        }
         return cell
     }
 
@@ -102,8 +103,7 @@ UIViewController, UITableViewDataSource, UITableViewDelegate where Command.Model
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
 
-        let selected = command.data[indexPath.row]
-        if !command.isSelected(model: selected) {
+        if let selected = command.data[safe: indexPath.row], !command.isSelected(model: selected) {
             command.handleSelectedChange(selected: selected, viewController: self)
             tableView.reloadData()
         }