Improved parsing of --bbox command line option

joto · joto · commit 193ac44a9878 · 2024-08-15T14:06:25.000+02:00
Without use of scanf.
diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
@@ -18,13 +18,15 @@
 #include "util.hpp"
 #include "version.hpp"
 
+#include <osmium/util/string.hpp>
 #include <osmium/version.hpp>
 
 #include <CLI/CLI.hpp>
 
 #include <lua.hpp>
 
 #include <algorithm>
+#include <cmath>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
@@ -33,21 +35,36 @@
 
 namespace {
 
-osmium::Box parse_bbox_param(std::string const &arg)
+void error_bbox()
+{
+    throw std::runtime_error{"Bounding box must be specified like: "
+                             "minlon,minlat,maxlon,maxlat."};
+}
+
+double parse_and_check_coordinate(std::string const &str)
 {
-    double minx = NAN;
-    double maxx = NAN;
-    double miny = NAN;
-    double maxy = NAN;
+    char *end = nullptr;
+
+    double const value = std::strtod(str.c_str(), &end);
+    if (end != &*str.end() || !std::isfinite(value)) {
+        error_bbox();
+    }
 
-    int const n =
-        sscanf(arg.c_str(), "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
+    return value;
+}
 
-    if (n != 4) {
-        throw std::runtime_error{"Bounding box must be specified like: "
-                                 "minlon,minlat,maxlon,maxlat."};
+osmium::Box parse_bbox_param(std::string const &arg)
+{
+    auto const values = osmium::split_string(arg, ',', true);
+    if (values.size() != 4) {
+        error_bbox();
     }
 
+    double const minx = parse_and_check_coordinate(values[0]);
+    double const miny = parse_and_check_coordinate(values[1]);
+    double const maxx = parse_and_check_coordinate(values[2]);
+    double const maxy = parse_and_check_coordinate(values[3]);
+
     if (maxx <= minx) {
         throw std::runtime_error{
             "Bounding box failed due to maxlon <= minlon."};
@@ -60,7 +77,12 @@ osmium::Box parse_bbox_param(std::string const &arg)
 
     log_debug("Applying bounding box: {},{} to {},{}", minx, miny, maxx, maxy);
 
-    return osmium::Box{minx, miny, maxx, maxy};
+    osmium::Box const box{minx, miny, maxx, maxy};
+    if (!box.valid()) {
+        error_bbox();
+    }
+
+    return box;
 }
 
 void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
@@ -89,6 +89,24 @@ TEST_CASE("Parsing bbox fails if wrong format", "[NoDB]")
 {
     bad_opt({"-b", "123"}, "Bounding box must be specified like:"
                            " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,3,4x"}, "Bounding box must be specified like:"
+                                " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,,3,4"}, "Bounding box must be specified like:"
+                              " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,3"}, "Bounding box must be specified like:"
+                             " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,3,4,5"}, "Bounding box must be specified like:"
+                                 " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,2,INF,4"}, "Bounding box must be specified like:"
+                                 " minlon,minlat,maxlon,maxlat.");
+
+    bad_opt({"-b", "1,NAN,3,4"}, "Bounding box must be specified like:"
+                                 " minlon,minlat,maxlon,maxlat.");
 }
 
 TEST_CASE("Parsing number-processes", "[NoDB]")
