Title: [128339] trunk/Source/WTF
Revision
128339
Author
msab...@apple.com
Date
2012-09-12 10:46:45 -0700 (Wed, 12 Sep 2012)

Log Message

Build fixed for http://trac.webkit.org/changeset/128243

Unreviewed build fix.

Change UnicodeString::extract for gcc based on ICU fix described in
http://bugs.icu-project.org/trac/ticket/8197.

* icu/unicode/unistr.h:
(UnicodeString::extract):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (128338 => 128339)


--- trunk/Source/WTF/ChangeLog	2012-09-12 17:42:23 UTC (rev 128338)
+++ trunk/Source/WTF/ChangeLog	2012-09-12 17:46:45 UTC (rev 128339)
@@ -1,3 +1,15 @@
+2012-09-12  Michael Saboff  <msab...@apple.com>
+
+        Build fixed for http://trac.webkit.org/changeset/128243
+
+        Unreviewed build fix.
+
+        Change UnicodeString::extract for gcc based on ICU fix described in
+        http://bugs.icu-project.org/trac/ticket/8197.
+
+        * icu/unicode/unistr.h:
+        (UnicodeString::extract):
+
 2012-09-12  Ilya Tikhonovsky  <loi...@chromium.org>
 
         Web Inspector: NMI move String* instrumentation to wtf.

Modified: trunk/Source/WTF/icu/unicode/unistr.h (128338 => 128339)


--- trunk/Source/WTF/icu/unicode/unistr.h	2012-09-12 17:42:23 UTC (rev 128338)
+++ trunk/Source/WTF/icu/unicode/unistr.h	2012-09-12 17:46:45 UTC (rev 128339)
@@ -4086,15 +4086,14 @@
 
 {
   // This dstSize value will be checked explicitly
-#if defined(__GNUC__)
-  // Ticket #7039: Clip length to the maximum valid length to the end of addressable memory given the starting address
-  // This is only an issue when using GCC and certain optimizations are turned on.
-  return extract(start, _length, dst, dst!=0 ? ((dst >= (char*)((size_t)-1) - UINT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage);
-#else
+  // Removed #if defined(__GNUC__) per ICU defect http://bugs.icu-project.org/trac/ticket/8197
   return extract(start, _length, dst, dst!=0 ? 0xffffffff : 0, codepage);
-#endif
 }
-
+extract(int32_t start,
+        int32_t startLength,
+        char *target,
+        uint32_t targetLength,
+        const char *codepage)
 #endif
 
 inline void
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to