Merge pull request #214 from MarkLee131/fix/getcolumnnames-empty-label-row

d99kris · web-flow · commit de6533b7a9e6 · 2026-04-12T12:41:38.000+08:00
fix GetColumnNames() undefined behavior on empty label row
diff --git a/src/rapidcsv.h b/src/rapidcsv.h
@@ -1473,9 +1473,13 @@ namespace rapidcsv
     {
       if (mLabelParams.mColumnNameIdx >= 0)
       {
-        return std::vector<std::string>(mData.at(static_cast<size_t>(mLabelParams.mColumnNameIdx)).begin() +
-                                        (mLabelParams.mRowNameIdx + 1),
-                                        mData.at(static_cast<size_t>(mLabelParams.mColumnNameIdx)).end());
+        const auto& labelRow = mData.at(static_cast<size_t>(mLabelParams.mColumnNameIdx));
+        const size_t offset = static_cast<size_t>(mLabelParams.mRowNameIdx + 1);
+        if (offset <= labelRow.size())
+        {
+          return std::vector<std::string>(labelRow.begin() + static_cast<int>(offset),
+                                          labelRow.end());
+        }
       }
 
       return std::vector<std::string>();

Original file line number	Diff line number	Diff line change
`@@ -1473,9 +1473,13 @@ namespace rapidcsv`
`1473`	`1473`	`{`
`1474`	`1474`	`if (mLabelParams.mColumnNameIdx >= 0)`
`1475`	`1475`	`{`
`1476`		`- return std::vector<std::string>(mData.at(static_cast<size_t>(mLabelParams.mColumnNameIdx)).begin() +`
`1477`		`- (mLabelParams.mRowNameIdx + 1),`
`1478`		`- mData.at(static_cast<size_t>(mLabelParams.mColumnNameIdx)).end());`
	`1476`	`+ const auto& labelRow = mData.at(static_cast<size_t>(mLabelParams.mColumnNameIdx));`
	`1477`	`+ const size_t offset = static_cast<size_t>(mLabelParams.mRowNameIdx + 1);`
	`1478`	`+ if (offset <= labelRow.size())`
	`1479`	`+ {`
	`1480`	`+ return std::vector<std::string>(labelRow.begin() + static_cast<int>(offset),`
	`1481`	`+ labelRow.end());`
	`1482`	`+ }`
`1479`	`1483`	`}`
`1480`	`1484`
`1481`	`1485`	`return std::vector<std::string>();`