[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 41917a1bd50ef8312cef48d10f9b58a21b1bc132
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 12 00:52:10 2003 +0000

            Reviewed by John.
    
            - fixed mistake in that last check-in that made Safari assert on startup with Chris's bookmarks bar
    
            * Misc.subproj/WebStringTruncator.m: (centerTruncateToBuffer):
            Fix logic here to not use an uninitialized variable.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ce3fc9a..9387a3d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by John.
 
+        - fixed mistake in that last check-in that made Safari assert on startup with Chris's bookmarks bar
+
+        * Misc.subproj/WebStringTruncator.m: (centerTruncateToBuffer):
+        Fix logic here to not use an uninitialized variable.
+
+2003-03-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
         - fixed 3193213 -- assert truncatedLength+1 < STRING_BUFFER_SIZE creating tab label for firstyearibs.com
         - fixed 3194935 -- WebStringTruncator rightTruncateString: will break between composed characters
         - fixed right truncator to use interpolation algorithm rather than linear search
diff --git a/WebKit/Misc.subproj/WebStringTruncator.m b/WebKit/Misc.subproj/WebStringTruncator.m
index 64ff050..20505b5 100644
--- a/WebKit/Misc.subproj/WebStringTruncator.m
+++ b/WebKit/Misc.subproj/WebStringTruncator.m
@@ -28,11 +28,11 @@ static unsigned centerTruncateToBuffer(NSString *string, unsigned length, unsign
     ASSERT(keepCount < STRING_BUFFER_SIZE);
     
     unsigned omitStart = (keepCount + 1) / 2;
+    unsigned omitEnd = NSMaxRange([string rangeOfComposedCharacterSequenceAtIndex:omitStart + (length - keepCount) - 1]);
+    omitStart = [string rangeOfComposedCharacterSequenceAtIndex:omitStart].location;
     
-    NSRange beforeRange = NSMakeRange(0, [string rangeOfComposedCharacterSequenceAtIndex:omitStart].location);
-
-    NSRange omitEndRange = [string rangeOfComposedCharacterSequenceAtIndex:omitStart + (length - keepCount) - 1];
-    NSRange afterRange = NSMakeRange(NSMaxRange(omitEndRange), length - afterRange.location);
+    NSRange beforeRange = NSMakeRange(0, omitStart);
+    NSRange afterRange = NSMakeRange(omitEnd, length - omitEnd);
     
     unsigned truncatedLength = beforeRange.length + 1 + afterRange.length;
     ASSERT(truncatedLength <= length);

-- 
WebKit Debian packaging