Bail out on invalid zoom level

CelliesProjects · CelliesProjects · commit d7feafa074df · 2025-03-25T10:10:50.000+01:00
diff --git a/src/OpenStreetMap-esp32.cpp b/src/OpenStreetMap-esp32.cpp
@@ -377,6 +377,9 @@ std::optional<std::unique_ptr<MemoryBuffer>> OpenStreetMap::urlToBuffer(const St
 
 bool OpenStreetMap::fetchTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result)
 {
+    if (zoom < 1 || zoom > OSM_MAX_ZOOM)
+        result = "Invalid zoom level: " + String(zoom);
+
     const uint32_t worldTileWidth = 1 << zoom;
     if (x >= worldTileWidth || y >= worldTileWidth)
     {

Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,9 @@ std::optional<std::unique_ptr<MemoryBuffer>> OpenStreetMap::urlToBuffer(const St`
`377`	`377`
`378`	`378`	`bool OpenStreetMap::fetchTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result)`
`379`	`379`	`{`
	`380`	`+ if (zoom < 1 \|\| zoom > OSM_MAX_ZOOM)`
	`381`	`+ result = "Invalid zoom level: " + String(zoom);`
	`382`	`+`
`380`	`383`	`const uint32_t worldTileWidth = 1 << zoom;`
`381`	`384`	`if (x >= worldTileWidth \|\| y >= worldTileWidth)`
`382`	`385`	`{`