Author: tgoettlicher Date: Fri Apr 9 17:33:55 2010 New Revision: 61640 URL: http://svn.opensuse.org/viewcvs/yast?rev=61640&view=rev Log: - Fixed endless loop in layout algorithm (bnc #558699) - V 2.19.1 Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YLayoutBox.cc Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=61640&r1=61639&r2=61640&view=diff ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Fri Apr 9 17:33:55 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.changes?rev=61640&r1=61639&r2=61640&view=diff ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Fri Apr 9 17:33:55 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 9 17:29:14 CEST 2010 - tgoettlicher@suse.de + +- Fixed endless loop in layout algorithm (bnc #558699) +- V 2.19.1 + +------------------------------------------------------------------- Tue Mar 2 12:38:32 UTC 2010 - coolo@novell.com - Fixing undefined behaviour that triggers a crash with Modified: trunk/libyui/src/YLayoutBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YLayoutBox.cc?rev=61640&r1=61639&r2=61640&view=diff ============================================================================== --- trunk/libyui/src/YLayoutBox.cc (original) +++ trunk/libyui/src/YLayoutBox.cc Fri Apr 9 17:33:55 2010 @@ -623,6 +623,8 @@ // Distribute loss + int oldTooSmall = tooSmall; + int oldLoserCount = loserCount; while ( tooSmall > 0 && loserCount > 0 ) { if ( debugLayout() ) @@ -675,6 +677,16 @@ << endl; } } + + if ( oldTooSmall == tooSmall && + oldLoserCount == loserCount ) + { + yuiWarning() << "Preventing endless loop while layout space distribution. Break." << endl; + break; + } + + oldTooSmall = tooSmall; + oldLoserCount = loserCount; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org