From 70acdf46bdebb16e153eb2065a5d695bfe59c511 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Fri, 20 Mar 2009 08:58:07 +0000 Subject: [PATCH] Fix inconsitency in NSScrollView decoding that led to uninitialized memory being used. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28103 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 1 + Source/NSScrollView.m | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69599358b..aa37dda7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * Source/NSOutlineView.m (-drawRow:clipRect:): Changed order of expresions in condition to avoid possible access to uninitialized memory. + * Source/NSScrollView.m (-initWithCoder:): Don't set _hasCornerView. 2009-03-18 Richard Frith-Macdonald diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m index bc0bf9505..035eb76fe 100644 --- a/Source/NSScrollView.m +++ b/Source/NSScrollView.m @@ -1107,7 +1107,7 @@ static float scrollerWidth; /* Now place the corner view. */ if (_hasCornerView) { - NSPoint p = headerRect.origin; + NSPoint p = headerRect.origin; if (verticalScrollerEdge == NSMaxXEdge) { @@ -1593,7 +1593,6 @@ static float scrollerWidth; if ([aDecoder containsValueForKey: @"NSHeaderClipView"]) { _hasHeaderView = YES; - _hasCornerView = YES; _headerClipView = [aDecoder decodeObjectForKey: @"NSHeaderClipView"]; }