Merge pull request #1977 from KLayout/bugfix/issue-1976

Fixed issue #1976 (crash on cross mode, lw > 1 and oversampling)
KLayout · Jan 22, 2025 · 71a943a · 71a943a
2 parents 18c86cb + 2b2eb2e
commit 71a943a
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/laybasic/laybasic/layLayoutViewBase.cc b/src/laybasic/laybasic/layLayoutViewBase.cc
@@ -1745,13 +1745,21 @@ LayoutViewBase::icon_for_layer (const LayerPropertiesConstIterator &iter, unsign
 
     frame.fill (i, w - 1 - p0, w - p0);
     frame.fill (i, w - 1 - (wp - p1), w - (wp - p1));
-    frame.fill (i, w - 1 - p0x, w - p0x);
-    frame.fill (i, w - 1 - (wp - p1x), w - (wp - p1x));
+    if ((unsigned int) p0x < w) {
+      frame.fill (i, w - 1 - p0x, w - p0x);
+    }
+    if ((unsigned int) (wp - p1x) < w) {
+      frame.fill (i, w - 1 - (wp - p1x), w - (wp - p1x));
+    }
 
     while (d < ddx) {
       d += ddy;
-      frame.fill (i, w - 1 - p0x, w - p0x);
-      frame.fill (i, w - 1 - (wp - p1x), w - (wp - p1x));
+      if ((unsigned int) p0x < w) {
+        frame.fill (i, w - 1 - p0x, w - p0x);
+      }
+      if ((unsigned int) (wp - p1x) < w) {
+        frame.fill (i, w - 1 - (wp - p1x), w - (wp - p1x));
+      }
       ++p0x;
       ++p1x;
     }