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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:52:25 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit da2cbe81a273933e2979f05ed3e56990f3e4007d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 15 17:32:56 2001 +0000

    Fixed a buffer overrun in leftRight()
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 7c22d74..ba27c52 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1322,7 +1322,7 @@ QString QString::leftRight(uint width, bool left) const
             if (len > width) {
                 CFStringRef tmp = CFStringCreateWithSubstring(
                         kCFAllocatorDefault, s, left ? CFRangeMake(0, width)
-                        : CFRangeMake(len - width, len));
+                        : CFRangeMake(len - width, width));
                 if (tmp) {
                     qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
                             tmp);
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 7c22d74..ba27c52 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1322,7 +1322,7 @@ QString QString::leftRight(uint width, bool left) const
             if (len > width) {
                 CFStringRef tmp = CFStringCreateWithSubstring(
                         kCFAllocatorDefault, s, left ? CFRangeMake(0, width)
-                        : CFRangeMake(len - width, len));
+                        : CFRangeMake(len - width, width));
                 if (tmp) {
                     qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
                             tmp);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list