Merge pull request #458 from girder/guard-tile-range

Guard against reading tiff tiles outside of the image.
girder · Jun 12, 2020 · 712ce6d · 712ce6d
2 parents 20a606f + 2ca9db3
commit 712ce6d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/sources/tiff/large_image_source_tiff/__init__.py b/sources/tiff/large_image_source_tiff/__init__.py
@@ -277,6 +277,13 @@ def getTile(self, x, y, z, pilImageAllowed=False, numpyAllowed=False,
                 sparseFallback=False, **kwargs):
         if z < 0:
             raise TileSourceException('z layer does not exist')
+        scale = 2 ** (self.levels - 1 - z)
+        offsetx = x * self.tileWidth * scale
+        if not (0 <= offsetx < self.sizeX):
+            raise TileSourceException('x is outside layer')
+        offsety = y * self.tileHeight * scale
+        if not (0 <= offsety < self.sizeY):
+            raise TileSourceException('y is outside layer')
         try:
             allowStyle = True
             if self._tiffDirectories[z] is None: