| From 5fa3165613b77b516e2b0dc128f73b673bd3ec8b Mon Sep 17 00:00:00 2001 |
| From: Ignacio Casal Quinteiro <qignacio@amazon.com> |
| Date: Sun, 16 Apr 2017 13:56:09 +0200 |
| Subject: [PATCH] tknzr: support only max long rgb values |
| |
| This fixes a possible out of bound when reading rgbs which |
| are longer than the support MAXLONG |
| |
| Upstream-Status: Backport [https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7] |
| CVE: CVE-2017-7961 |
| Signed-off-by: Sinan Kaya <okaya@kernel.org> |
| --- |
| src/cr-tknzr.c | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c |
| index e3af0ee..76886ec 100644 |
| --- a/src/cr-tknzr.c |
| +++ b/src/cr-tknzr.c |
| @@ -1280,6 +1280,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) |
| status = cr_tknzr_parse_num (a_this, &num); |
| ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); |
| |
| + if (num->val > G_MAXLONG) { |
| + status = CR_PARSING_ERROR; |
| + goto error; |
| + } |
| + |
| red = num->val; |
| cr_num_destroy (num); |
| num = NULL; |
| @@ -1299,6 +1304,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) |
| status = cr_tknzr_parse_num (a_this, &num); |
| ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); |
| |
| + if (num->val > G_MAXLONG) { |
| + status = CR_PARSING_ERROR; |
| + goto error; |
| + } |
| + |
| PEEK_BYTE (a_this, 1, &next_bytes[0]); |
| if (next_bytes[0] == '%') { |
| SKIP_CHARS (a_this, 1); |
| -- |
| 2.19.0 |
| |