summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-06-08 12:06:40 -0400
committerMarco Trevisan (TreviƱo) <mail@3v1n0.net>2021-05-05 16:38:25 +0200
commit1f75fc9089274a1fcb9ab7eb647e144f48c81fab (patch)
treedfe7711b581d168c2ac9d52388f74eb2b749c4d5
parent04031036fb1b80a47c7030053f4767363935c068 (diff)
downloadpango-1f75fc9089274a1fcb9ab7eb647e144f48c81fab.tar.gz
renderer: Fix a division-by-zero
We need to check if height is zero before dividing by it. For completeness, check width at the same time. This was pointed out in https://gitlab.gnome.org/GNOME/pango/-/merge_requests/167 (cherry-picked from commit dd867f41)
-rw-r--r--pango/pango-renderer.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index 889989dd..5e98fd16 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -974,15 +974,22 @@ pango_renderer_default_draw_error_underline (PangoRenderer *renderer,
int width,
int height)
{
- int square = height / HEIGHT_SQUARES;
- int unit_width = (HEIGHT_SQUARES - 1) * square;
- int width_units = (width + unit_width / 2) / unit_width;
+ int square;
+ int unit_width;
+ int width_units;
const PangoMatrix identity = PANGO_MATRIX_INIT;
const PangoMatrix *matrix;
double dx, dx0, dy0;
PangoMatrix total;
int i;
+ if (width <= 0 || height <= 0)
+ return;
+
+ square = height / HEIGHT_SQUARES;
+ unit_width = (HEIGHT_SQUARES - 1) * square;
+ width_units = (width + unit_width / 2) / unit_width;
+
x += (width - width_units * unit_width) / 2;
if (renderer->matrix)