!4 fix CVE-2019-10872
From: @yanan-rock Reviewed-by: @orange-snn Signed-off-by: @orange-snn
This commit is contained in:
openeuler-ci-bot
Gitee
commit
27905de0f2
141
CVE-2019-10872.patch
Normal file
141
CVE-2019-10872.patch
Normal file
@ -0,0 +1,141 @@
|
|||||||
|
From 6a1580e84f492b5671d23be98192267bb73de250 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marek Kasik <mkasik@redhat.com>
|
||||||
|
Date: Mon, 13 May 2019 15:08:38 +0200
|
||||||
|
Subject: [PATCH] Splash: Restrict filling of overlapping boxes
|
||||||
|
|
||||||
|
Check whether area to fill in Splash::blitTransparent()
|
||||||
|
does not run out of allocated memory for source and for destination
|
||||||
|
and shrink it if needed.
|
||||||
|
|
||||||
|
Fixes #750
|
||||||
|
---
|
||||||
|
splash/Splash.cc | 48 +++++++++++++++++++++++++++++++++---------------
|
||||||
|
1 file changed, 33 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/splash/Splash.cc b/splash/Splash.cc
|
||||||
|
index 0a06f9c8..4ac163e4 100644
|
||||||
|
--- a/splash/Splash.cc
|
||||||
|
+++ b/splash/Splash.cc
|
||||||
|
@@ -5853,7 +5853,7 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
int xDest, int yDest, int w, int h) {
|
||||||
|
SplashColorPtr p, sp;
|
||||||
|
Guchar *q;
|
||||||
|
- int x, y, mask, srcMask;
|
||||||
|
+ int x, y, mask, srcMask, width = w, height = h;
|
||||||
|
|
||||||
|
if (src->mode != bitmap->mode) {
|
||||||
|
return splashErrModeMismatch;
|
||||||
|
@@ -5863,14 +5863,32 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
return splashErrZeroImage;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (src->getWidth() - xSrc < width)
|
||||||
|
+ width = src->getWidth() - xSrc;
|
||||||
|
+
|
||||||
|
+ if (src->getHeight() - ySrc < height)
|
||||||
|
+ height = src->getHeight() - ySrc;
|
||||||
|
+
|
||||||
|
+ if (bitmap->getWidth() - xDest < width)
|
||||||
|
+ width = bitmap->getWidth() - xDest;
|
||||||
|
+
|
||||||
|
+ if (bitmap->getHeight() - yDest < height)
|
||||||
|
+ height = bitmap->getHeight() - yDest;
|
||||||
|
+
|
||||||
|
+ if (width < 0)
|
||||||
|
+ width = 0;
|
||||||
|
+
|
||||||
|
+ if (height < 0)
|
||||||
|
+ height = 0;
|
||||||
|
+
|
||||||
|
switch (bitmap->mode) {
|
||||||
|
case splashModeMono1:
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
p = &bitmap->data[(yDest + y) * bitmap->rowSize + (xDest >> 3)];
|
||||||
|
mask = 0x80 >> (xDest & 7);
|
||||||
|
sp = &src->data[(ySrc + y) * src->rowSize + (xSrc >> 3)];
|
||||||
|
srcMask = 0x80 >> (xSrc & 7);
|
||||||
|
- for (x = 0; x < w; ++x) {
|
||||||
|
+ for (x = 0; x < width; ++x) {
|
||||||
|
if (*sp & srcMask) {
|
||||||
|
*p |= mask;
|
||||||
|
} else {
|
||||||
|
@@ -5888,20 +5906,20 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case splashModeMono8:
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
p = &bitmap->data[(yDest + y) * bitmap->rowSize + xDest];
|
||||||
|
sp = &src->data[(ySrc + y) * bitmap->rowSize + xSrc];
|
||||||
|
- for (x = 0; x < w; ++x) {
|
||||||
|
+ for (x = 0; x < width; ++x) {
|
||||||
|
*p++ = *sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case splashModeRGB8:
|
||||||
|
case splashModeBGR8:
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
p = &bitmap->data[(yDest + y) * bitmap->rowSize + 3 * xDest];
|
||||||
|
sp = &src->data[(ySrc + y) * src->rowSize + 3 * xSrc];
|
||||||
|
- for (x = 0; x < w; ++x) {
|
||||||
|
+ for (x = 0; x < width; ++x) {
|
||||||
|
*p++ = *sp++;
|
||||||
|
*p++ = *sp++;
|
||||||
|
*p++ = *sp++;
|
||||||
|
@@ -5909,10 +5927,10 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case splashModeXBGR8:
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
p = &bitmap->data[(yDest + y) * bitmap->rowSize + 4 * xDest];
|
||||||
|
sp = &src->data[(ySrc + y) * src->rowSize + 4 * xSrc];
|
||||||
|
- for (x = 0; x < w; ++x) {
|
||||||
|
+ for (x = 0; x < width; ++x) {
|
||||||
|
*p++ = *sp++;
|
||||||
|
*p++ = *sp++;
|
||||||
|
*p++ = *sp++;
|
||||||
|
@@ -5923,10 +5941,10 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
break;
|
||||||
|
#ifdef SPLASH_CMYK
|
||||||
|
case splashModeCMYK8:
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
p = &bitmap->data[(yDest + y) * bitmap->rowSize + 4 * xDest];
|
||||||
|
sp = &src->data[(ySrc + y) * src->rowSize + 4 * xSrc];
|
||||||
|
- for (x = 0; x < w; ++x) {
|
||||||
|
+ for (x = 0; x < width; ++x) {
|
||||||
|
*p++ = *sp++;
|
||||||
|
*p++ = *sp++;
|
||||||
|
*p++ = *sp++;
|
||||||
|
@@ -5935,10 +5953,10 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case splashModeDeviceN8:
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
p = &bitmap->data[(yDest + y) * bitmap->rowSize + (SPOT_NCOMPS+4) * xDest];
|
||||||
|
sp = &src->data[(ySrc + y) * src->rowSize + (SPOT_NCOMPS+4) * xSrc];
|
||||||
|
- for (x = 0; x < w; ++x) {
|
||||||
|
+ for (x = 0; x < width; ++x) {
|
||||||
|
for (int cp=0; cp < SPOT_NCOMPS+4; cp++)
|
||||||
|
*p++ = *sp++;
|
||||||
|
}
|
||||||
|
@@ -5948,9 +5966,9 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bitmap->alpha) {
|
||||||
|
- for (y = 0; y < h; ++y) {
|
||||||
|
+ for (y = 0; y < height; ++y) {
|
||||||
|
q = &bitmap->alpha[(yDest + y) * bitmap->width + xDest];
|
||||||
|
- memset(q, 0x00, w);
|
||||||
|
+ memset(q, 0x00, width);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
10
poppler.spec
10
poppler.spec
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: poppler
|
Name: poppler
|
||||||
Version: 0.67.0
|
Version: 0.67.0
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Poppler is a PDF rendering library based on the xpdf-3.0 code base
|
Summary: Poppler is a PDF rendering library based on the xpdf-3.0 code base
|
||||||
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
|
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
|
||||||
URL: https://poppler.freedesktop.org/
|
URL: https://poppler.freedesktop.org/
|
||||||
@ -29,7 +29,7 @@ Patch6008: CVE-2019-11026.patch
|
|||||||
Patch6009: CVE-2018-19058.patch
|
Patch6009: CVE-2018-19058.patch
|
||||||
Patch6010: CVE-2018-19059.patch
|
Patch6010: CVE-2018-19059.patch
|
||||||
Patch6011: CVE-2018-20650.patch
|
Patch6011: CVE-2018-20650.patch
|
||||||
|
Patch6012: CVE-2019-10872.patch
|
||||||
|
|
||||||
BuildRequires: cmake gcc-c++ gettext-devel qt5-qtbase-devel qt-devel cairo-devel fontconfig-devel
|
BuildRequires: cmake gcc-c++ gettext-devel qt5-qtbase-devel qt-devel cairo-devel fontconfig-devel
|
||||||
BuildRequires: freetype-devel gdk-pixbuf2-devel glib2-devel gobject-introspection-devel gtk3-devel
|
BuildRequires: freetype-devel gdk-pixbuf2-devel glib2-devel gobject-introspection-devel gtk3-devel
|
||||||
@ -238,6 +238,12 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 29 2020 yanan <yanan@huawei.com> - 0.67.0-6
|
||||||
|
- Type:cves
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix CVE-2019-10872
|
||||||
|
|
||||||
* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-5
|
* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-5
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user