From 2261710fe0dffd60433e3362ac12adf4db570fe5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 24 Aug 2005 23:38:25 +0000 Subject: [PATCH] Fix a bug where NULL could be dereferenced during the pixmap kick-out process by referencing the correct offscreen area. Also drive-by the comments related to these for clarity. --- exa/exa_offscreen.c | 6 +++--- hw/xfree86/exa/exa_offscreen.c | 6 +++--- hw/xfree86/exa/exaoffscreen.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index dbca172c4..e55e0ac43 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -127,7 +127,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, if (begin->state == ExaOffscreenLocked) continue; - /* adjust size to match alignment requirement */ + /* adjust size needed to account for alignment loss for this area */ real_size = size; tmp = begin->offset % align; if (tmp) @@ -164,9 +164,9 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, return NULL; } - /* adjust size to match alignment requirement */ + /* adjust size needed to account for alignment loss for this area */ real_size = size; - tmp = begin->offset % align; + tmp = area->offset % align; if (tmp) real_size += (align - tmp); diff --git a/hw/xfree86/exa/exa_offscreen.c b/hw/xfree86/exa/exa_offscreen.c index dbca172c4..e55e0ac43 100644 --- a/hw/xfree86/exa/exa_offscreen.c +++ b/hw/xfree86/exa/exa_offscreen.c @@ -127,7 +127,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, if (begin->state == ExaOffscreenLocked) continue; - /* adjust size to match alignment requirement */ + /* adjust size needed to account for alignment loss for this area */ real_size = size; tmp = begin->offset % align; if (tmp) @@ -164,9 +164,9 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, return NULL; } - /* adjust size to match alignment requirement */ + /* adjust size needed to account for alignment loss for this area */ real_size = size; - tmp = begin->offset % align; + tmp = area->offset % align; if (tmp) real_size += (align - tmp); diff --git a/hw/xfree86/exa/exaoffscreen.c b/hw/xfree86/exa/exaoffscreen.c index dbca172c4..e55e0ac43 100644 --- a/hw/xfree86/exa/exaoffscreen.c +++ b/hw/xfree86/exa/exaoffscreen.c @@ -127,7 +127,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, if (begin->state == ExaOffscreenLocked) continue; - /* adjust size to match alignment requirement */ + /* adjust size needed to account for alignment loss for this area */ real_size = size; tmp = begin->offset % align; if (tmp) @@ -164,9 +164,9 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, return NULL; } - /* adjust size to match alignment requirement */ + /* adjust size needed to account for alignment loss for this area */ real_size = size; - tmp = begin->offset % align; + tmp = area->offset % align; if (tmp) real_size += (align - tmp);