INTEGRATION: CWS icuregexpatch_SRC680 (1.10.12); FILE MERGED

2008/01/28 22:57:06 er 1.10.12.2: #i85632# MSVC does not cope with escaped backslash
2008/01/28 21:03:22 er 1.10.12.1: Applied patch from ICU changeset 23292 against regular expression's memory mismanagement.
http://bugs.icu-project.org/trac/changeset/23292?format=3Ddiff

Description from
http://sourceforge.net/mailarchive/forum.php?thread_name=d03a2ffb0801221538x68825e42xb4a4aaf0fcccecbd%40mail.gmail.com&forum_name=icu-support

A regular expression pattern that contains a back reference to capture
group zero, \0, may cause references to random memory addresses, with
unpredictable results.

The backtracking stack used during matching operations has no upper
limit on its size. Internally to the match engine, the stack implementation
uses heap memory, and unconstrained growth may cause problems with heap
failures, thrashing or exhausted swap space.

1 files changed, 0 insertions, 112 deletions

diff --git a/icu/icu-3.6.patch b/icu/icu-3.6.patch
index 51b1c580e48d..b55516c8c151 100644
--- a/icu/icu-3.6.patch
+++ b/icu/icu-3.6.patch
@@ -1,9 +1,5 @@
 *** misc/icu/source/common/putil.c	Mon Jul 31 20:14:28 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/putil.c	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/putil.c	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 48,54 ****
   #endif
@@ -23,11 +19,7 @@
   #endif
   
 *** misc/icu/source/common/unicode/pwin32.h	Tue Aug 29 23:34:38 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/pwin32.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/pwin32.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 266,273 ****
 --- 266,278 ----
@@ -45,11 +37,7 @@
   /*===========================================================================*/
   /* Code alignment and C function inlining                                    */
 *** misc/icu/source/common/unicode/rbbi.h	Fri Aug 11 07:46:40 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/rbbi.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/rbbi.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 611,622 ****
 --- 611,624 ----
@@ -68,11 +56,7 @@
         * Common initialization function, used by constructors and bufferClone.
         *   (Also used by DictionaryBasedBreakIterator::createBufferClone().)
 *** misc/icu/source/common/unicode/umachine.h	Tue Feb  7 02:54:16 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/umachine.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/umachine.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 322,328 ****
    */
@@ -91,11 +75,7 @@
   #else
       typedef uint16_t UChar;
 *** misc/icu/source/common/unicode/unistr.h	Tue Aug 29 23:52:50 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/unistr.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/unistr.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 3280,3286 ****
   //========================================
@@ -199,11 +179,7 @@
   }
   
 *** misc/icu/source/common/unicode/ustring.h	Tue Aug 29 23:52:50 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/ustring.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/ustring.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 918,924 ****
    * </pre>
@@ -394,11 +370,7 @@
       count += size;
       return rp;
 *** misc/icu/source/config/mh-darwin	Wed Feb  1 08:52:42 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/config/mh-darwin	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/config/mh-darwin	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 25,31 ****
   SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
@@ -417,11 +389,7 @@
   ## Compiler switch to embed a runtime search path
   LD_RPATH=
 *** misc/icu/source/config/mh-irix	Thu Mar 23 19:51:52 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/config/mh-irix	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/config/mh-irix	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 23,28 ****
 --- 23,31 ----
@@ -435,11 +403,7 @@
   THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
   LIBCPPFLAGS =
 *** misc/icu/source/config/mh-linux	Thu Mar 23 19:51:52 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/config/mh-linux	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/config/mh-linux	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 20,25 ****
 --- 20,33 ----
@@ -458,11 +422,7 @@
   LDFLAGSICUDT=-nodefaultlibs -nostdlib
   
 *** misc/icu/source/config/mh-mingw	Tue Aug 15 10:24:14 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/config/mh-mingw	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/config/mh-mingw	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 54,59 ****
 --- 54,62 ----
@@ -496,11 +456,7 @@
   CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
   
 *** misc/icu/source/config/mh-solaris	Fri Feb 24 20:31:14 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/config/mh-solaris	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/config/mh-solaris	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 18,34 ****
   
@@ -547,11 +503,7 @@
   
   ## Compiler switch to embed a library name
 *** misc/icu/source/data/Makefile.in	Sat Aug 12 00:22:24 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/data/Makefile.in	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/data/Makefile.in	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 344,350 ****
   ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
@@ -748,11 +700,7 @@
           }
       }
 *** misc/icu/source/i18n/windtfmt.cpp	Tue Aug 15 08:48:02 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/i18n/windtfmt.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/i18n/windtfmt.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 232,249 ****
       UChar stackBuffer[STACK_BUFFER_SIZE];
@@ -832,11 +780,7 @@
       if (buffer != stackBuffer) {
           DELETE_ARRAY(buffer);
 *** misc/icu/source/i18n/winnmfmt.cpp	Thu Aug 17 07:21:06 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/i18n/winnmfmt.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/i18n/winnmfmt.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 86,95 ****
       GetLocaleInfoA(lcid, LOCALE_SGROUPING, buf, 10);
@@ -974,11 +918,7 @@
       if (buffer != stackBuffer) {
           DELETE_ARRAY(buffer);
 *** misc/icu/source/layout/CoverageTables.cpp	Sat May  8 01:28:42 2004
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/CoverageTables.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/CoverageTables.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 44,49 ****
 --- 44,53 ----
@@ -993,11 +933,7 @@
       le_uint16 probe = power;
       le_uint16 index = 0;
 *** misc/icu/source/layout/DeviceTables.cpp	Fri Jan 14 18:25:12 2005
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/DeviceTables.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/DeviceTables.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 22,28 ****
       le_uint16 format = SWAPW(deltaFormat) - 1;
@@ -1017,11 +953,7 @@
           le_uint16 bits = fieldBits[format];
           le_uint16 count = 16 / bits;
 *** misc/icu/source/layout/GXLayoutEngine.cpp	Fri Sep  2 20:22:10 2005
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/GXLayoutEngine.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/GXLayoutEngine.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 39,45 ****
           return 0;
@@ -1040,11 +972,7 @@
       if (LE_FAILURE(success)) {
           return 0;
 *** misc/icu/source/layout/IndicClassTables.cpp	Wed Aug 23 02:12:40 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/IndicClassTables.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/IndicClassTables.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 94,100 ****
       _dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF
@@ -1178,11 +1106,7 @@
   //
   // IndicClassTable addresses
 *** misc/icu/source/layout/IndicReordering.cpp	Tue Apr 25 21:08:12 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/IndicReordering.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/IndicReordering.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 50,55 ****
 --- 50,63 ----
@@ -1287,11 +1211,7 @@
                   output.writeMbelow();
                   output.writeSMbelow(); // FIXME: there are no SMs in these scripts...
 *** misc/icu/source/layout/LESwaps.h	Thu Jun 23 00:39:36 2005
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/LESwaps.h	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/LESwaps.h	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 2,7 ****
 --- 2,8 ----
@@ -1367,11 +1287,7 @@
    * This class is used to access data which stored in big endian order
    * regardless of the conventions of the platform. It has been designed
 *** misc/icu/source/layout/MPreFixups.cpp	Sat May  8 01:28:44 2004
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/MPreFixups.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/MPreFixups.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 40,45 ****
 --- 40,51 ----
@@ -1388,11 +1304,7 @@
   {
       for (le_int32 fixup = 0; fixup < fFixupCount; fixup += 1) {
 *** misc/icu/source/layout/MPreFixups.h	Mon Apr 12 20:51:32 2004
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/layout/MPreFixups.h	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/layout/MPreFixups.h	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 31,36 ****
 --- 31,38 ----
@@ -1405,11 +1317,7 @@
       FixupData *fFixupData;
       le_int32   fFixupCount;
 *** misc/icu/source/stubdata/Makefile.in	Fri Dec  2 11:21:34 2005
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/stubdata/Makefile.in	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/stubdata/Makefile.in	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 25,30 ****
 --- 25,36 ----
@@ -1426,11 +1334,7 @@
   ifneq ($(ENABLE_STATIC),)
   TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 *** misc/icu/source/test/intltest/loctest.cpp	Thu Jul  6 03:50:04 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/test/intltest/loctest.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/test/intltest/loctest.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 4,9 ****
 --- 4,10 ----
@@ -1550,11 +1454,7 @@
       // The following functions are internal to the regexp tests.
       virtual UBool doRegexLMTest(const char *pat, const char *text, UBool looking, UBool match, int line);
 *** misc/icu/source/test/intltest/tsputil.cpp	Wed Jul 19 00:18:10 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/test/intltest/tsputil.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/test/intltest/tsputil.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 4,9 ****
 --- 4,10 ----
@@ -1566,11 +1466,7 @@
   
   #include <float.h> // DBL_MAX, DBL_MIN
 *** misc/icu/source/test/intltest/uobjtest.cpp	Thu Mar 23 01:54:12 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/test/intltest/uobjtest.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/test/intltest/uobjtest.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 4,9 ****
 --- 4,10 ----
@@ -1582,11 +1478,7 @@
   #include "cmemory.h" // UAlignedMemory
   #include <string.h>
 *** misc/icu/source/test/intltest/ustrtest.cpp	Tue Dec 28 22:13:54 2004
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/test/intltest/ustrtest.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/test/intltest/ustrtest.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 4,9 ****
 --- 4,10 ----
@@ -1598,11 +1490,7 @@
   #include "unicode/unistr.h"
   #include "unicode/uchar.h"
 *** misc/icu/source/tools/icupkg/icupkg.cpp	Fri Jul 21 23:17:52 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/tools/icupkg/icupkg.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/tools/icupkg/icupkg.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 332,337 ****
 --- 332,341 ----