Do not try and crop glyphs from outside of source ImageFont image

radarhere · Dec 30, 2023 · 7e86cf7 · 7e86cf7
1 parent c9805df
commit 7e86cf7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/_imaging.c b/src/_imaging.c
@@ -2649,6 +2649,14 @@ _font_new(PyObject *self_, PyObject *args) {
         self->glyphs[i].sy0 = S16(B16(glyphdata, 14));
         self->glyphs[i].sx1 = S16(B16(glyphdata, 16));
         self->glyphs[i].sy1 = S16(B16(glyphdata, 18));
+        if (self->glyphs[i].sx1 > self->bitmap->xsize) {
+            self->glyphs[i].dx1 -= self->glyphs[i].sx1 - self->bitmap->xsize;
+            self->glyphs[i].sx1 = self->bitmap->xsize;
+        }
+        if (self->glyphs[i].sy1 > self->bitmap->ysize) {
+            self->glyphs[i].dy1 -= self->glyphs[i].sy1 - self->bitmap->ysize;
+            self->glyphs[i].sy1 = self->bitmap->ysize;
+        }
         if (self->glyphs[i].dy0 < y0) {
             y0 = self->glyphs[i].dy0;
         }