Merge branch 'master' into add-build-workflows

ad-freiburg · Oct 11, 2024 · d4219e5 · d4219e5
2 parents 6a32240 + 4caf2e1
commit d4219e5
Show file tree

Hide file tree

Showing 3 changed files with 246 additions and 11 deletions.
diff --git a/include/osm2rdf/osm/FactHandler.h b/include/osm2rdf/osm/FactHandler.h
@@ -92,10 +92,12 @@ class FactHandler {
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonth2);
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonth3);
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonth4);
+  FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonth5);
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonthDay1);
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonthDay2);
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonthDay3);
   FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonthDay4);
+  FRIEND_TEST(OSM_FactHandler, writeTagListStartDateYearMonthDay5);
 
   void writeSecondsAsISO(const std::string& s, const std::string& p,
                          const std::time_t& t);

diff --git a/src/osm/FactHandler.cpp b/src/osm/FactHandler.cpp
@@ -524,8 +524,20 @@ void osm2rdf::osm::FactHandler<W>::writeTagList(
           last = next + 1;
           continue;
         }
-        tmp << std::setw(resultType == 0 ? 4 : 2) << std::dec
-            << std::atoi(value.substr(last, next - last).c_str());
+        auto val = std::atoi(value.substr(last, next - last).c_str());
+
+        // basic validity checks according to ISO 8601
+        if (resultType == 1 && (val < 1 || val > 12)) {
+          resultType = 9;  // error
+          break;
+        }
+
+        if (resultType == 2 && (val < 1 || val > 31)) {
+          resultType = 9;  // error
+          break;
+        }
+
+        tmp << std::setw(resultType == 0 ? 4 : 2) << std::dec << val;
         newValue += tmp.str().substr(0, resultType == 0 ? 4 : 2) + '-';
         tmp.seekp(0);
         resultType++;