diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-02-09 19:17:02 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2006-02-09 19:17:02 +0000 |
| commit | 4cb33c194dc104b3f602676e957211862d936bc8 (patch) | |
| tree | 5b2eb1e0a60f743eeb338ce1ca9822e453aed228 | |
| parent | 74129e8c7b1c5e7ef0d22875632cbce8acc60d12 (diff) | |
2006-02-09 Kristian Høgsberg <krh@redhat.com>poppler-0.4.5
* configure.ac: Bump realease to 0.4.5.
* NEWS: Sum up changes.
* splash/Splash.cc: Add fix for CVE-2006-0301.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | splash/Splash.cc | 18 |
4 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2006-02-09 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Bump realease to 0.4.5. + + * NEWS: Sum up changes. + + * splash/Splash.cc: Add fix for CVE-2006-0301. + 2006-01-10 Kristian Høgsberg <krh@redhat.com> * configure.ac: Bump realease to 0.4.4. @@ -1,3 +1,7 @@ +Release 0.4.5 + + - Security update; CVE-2006-0301. + Release 0.4.4 - Security update; CVE-2005-3624, CVE-2005-3625, CVE-2005-3627. diff --git a/configure.ac b/configure.ac index c3e13216..081d923f 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,7 @@ dnl Based on kde acinclude.m4.in, LGPL Licensed AC_PREREQ(2.59) -AC_INIT(poppler, 0.4.4) +AC_INIT(poppler, 0.4.5) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(poppler/poppler-config.h) diff --git a/splash/Splash.cc b/splash/Splash.cc index d29215a0..7bd4137d 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -728,6 +728,10 @@ void Splash::drawPixel(int x, int y, SplashColor *color, GBool noClip) { SplashRGB8P *rgb8p; SplashBGR8P *bgr8; + if ( (unsigned) x >= (unsigned) bitmap->getWidth() || + (unsigned) y >= (unsigned) bitmap->getHeight()) + return; + if (noClip || state->clip->test(x, y)) { switch (bitmap->mode) { case splashModeMono1: @@ -766,6 +770,10 @@ void Splash::drawPixel(int x, int y, SplashPattern *pattern, GBool noClip) { SplashRGB8P *rgb8p; SplashBGR8P *bgr8; + if ( (unsigned) x >= (unsigned) bitmap->getWidth() || + (unsigned) y >= (unsigned) bitmap->getHeight()) + return; + if (noClip || state->clip->test(x, y)) { color = pattern->getColor(x, y); switch (bitmap->mode) { @@ -810,6 +818,11 @@ void Splash::drawSpan(int x0, int x1, int y, SplashPattern *pattern, SplashMono1 mask1; int i, j, n; + if ((unsigned) x0 >= (unsigned) bitmap->getWidth() || + (unsigned) x1 >= (unsigned) bitmap->getWidth() || + (unsigned) y >= (unsigned) bitmap->getHeight()) + return; + n = x1 - x0 + 1; switch (bitmap->mode) { @@ -909,6 +922,11 @@ void Splash::xorSpan(int x0, int x1, int y, SplashPattern *pattern, SplashMono1 mask1; int i, j, n; + if ((unsigned) x0 >= (unsigned) bitmap->getWidth() || + (unsigned) x1 >= (unsigned) bitmap->getWidth() || + (unsigned) y >= (unsigned) bitmap->getHeight()) + return; + n = x1 - x0 + 1; switch (bitmap->mode) { |