From e7e1d75d6ca522bd0139c6ef8b26662ce9631567 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 12 Oct 2024 22:57:11 +0200
Subject: [PATCH] XLSX: do not emit error on <row> without 'r' attribute

Fixes https://github.com/duckdb/duckdb_spatial/issues/425
---
 .../data/xlsx/row_without_r_attribute.xlsx    | Bin 0 -> 2325 bytes
 autotest/ogr/ogr_xlsx.py                      |  13 ++++++++++++
 ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp    |  20 ++++++++++++------
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 autotest/ogr/data/xlsx/row_without_r_attribute.xlsx

diff --git a/autotest/ogr/data/xlsx/row_without_r_attribute.xlsx b/autotest/ogr/data/xlsx/row_without_r_attribute.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..53fbf6b644cf4ad0d5d654796f392e4867a7dff1
GIT binary patch
literal 2325
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

literal 0
HcmV?d00001

diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index f0c7a3a877c9..a4b8cc287935 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -649,3 +649,16 @@ def test_ogr_xlsx_read_xml_prefix():
     f = lyr.GetNextFeature()
     assert f["Col1"] == "foo"
     assert f["Col2"] == "bar"
+
+
+###############################################################################
+# Test reading a XLSX file with <row> without "r" attribute
+
+
+def test_ogr_xlsx_read_row_without_r_attribute():
+
+    ds = ogr.Open("data/xlsx/row_without_r_attribute.xlsx")
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f["ID"] == 1
+    assert f["NAME"] == "TEST123"
diff --git a/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
index 5f4fdf4544eb..f7d32b508e4a 100644
--- a/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
+++ b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
@@ -816,14 +816,22 @@ void OGRXLSXDataSource::startElementTable(const char *pszNameIn,
         apoCurLineValues.clear();
         apoCurLineTypes.clear();
 
-        int nNewCurLine = atoi(GetAttributeValue(ppszAttr, "r", "0"));
-        if (nNewCurLine <= 0)
+        int nNewCurLine;
+        if (const char *pszR = GetAttributeValue(ppszAttr, "r", nullptr))
         {
-            CPLError(CE_Failure, CPLE_AppDefined, "Invalid row: %d",
-                     nNewCurLine);
-            return;
+            nNewCurLine = atoi(pszR);
+            if (nNewCurLine <= 0)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "Invalid row: %d",
+                         nNewCurLine);
+                return;
+            }
+            nNewCurLine--;
+        }
+        else
+        {
+            nNewCurLine = nCurLine;
         }
-        nNewCurLine--;
         const int nFields = std::max(
             static_cast<int>(apoFirstLineValues.size()),
             poCurLayer != nullptr ? poCurLayer->GetLayerDefn()->GetFieldCount()