Fixed a potential segfault in the text renderer

KLayout · Aug 3, 2024 · 40e360e · 40e360e
1 parent 3290d0a
commit 40e360e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/laybasic/laybasic/layBitmap.cc b/src/laybasic/laybasic/layBitmap.cc
@@ -293,16 +293,14 @@ Bitmap::fill_pattern (int y, int x, const uint32_t *pp, unsigned int stride, uns
 
     while (n > 0 && y >= 0) {
 
-      for (unsigned int s = 0; s < stride; ++s) {
+      for (unsigned int s = 0; s < stride; ++s, pp++) {
 
-        int x1 = x + s * 32;
-
-        uint32_t p = *pp++;
+        uint32_t p = *pp;
 
-        if (x1 < 0) {
-          if (x1 <= -32) {
-            return;
-          }
+        int x1 = x + s * 32;
+        if (x1 <= -32 || x1 >= m_width) {
+          continue;
+        } else if (x1 < 0) {
           p >>= (unsigned int)-x1;
           x1 = 0;
         }