Changeset 19440 for S60/trunk/JavaScriptCore

Timestamp:

02/06/07 14:03:51 (2 years ago)

Author:

brmorris

Message:

brmorris <bradley.morrison@nokia.com>, rs'd by zalan

DESC: merge from s60/branches/3.1m to s60/trunk of r19429, r19430, r19431, r19432 and r19433

Location:

S60/trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• group/JavaScriptCore.mmp (modified) (1 diff)
• pcre/pcre.c (modified) (8 diffs)

S60/trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+vbradley, Reviewed by Yongjun.
+        DESC: Fixed the stack size and pcre stack overflow. Limit the number
+    recursions that are allowed in match().
+        http://bugs.webkit.org/show_bug.cgi?id=12611
+
+        * group/JavaScriptCore.mmp:
+        * pcre/pcre.c:
+        (match):
+
 2006-10-25  yadavall  <sriram.yadavalli@nokia.com>
 

S60/trunk/JavaScriptCore/group/JavaScriptCore.mmp

@@ -33 +33 @@
 
 EPOCALLOWDLLDATA
+// heap size 20K - 16M
 EPOCHEAPSIZE 0x5000 0x1000000
+// stack size 64K
+epocstacksize 0x10000
 
 #if defined(ARMCC)

S60/trunk/JavaScriptCore/pcre/pcre.c

@@ -3649 +3649 @@
 
 
+#if NOKIA_CHANGES
+// Prototype match_internal()
+static BOOL
+match_internal(register const ichar *eptr, register const uschar *ecode,
+               int offset_top, match_data *md, unsigned long int ims,
+               eptrblock *eptrb, int flags);
 
 /*************************************************
@@ -3673 +3679 @@
 Returns:       TRUE if matched
 */
-
 static BOOL
 match(register const ichar *eptr, register const uschar *ecode,
@@ -3679 +3684 @@
   int flags)
 {
+    static int matchcount = 0;
+    static int matchcountMax = 0;
+    BOOL err;
+
+    if ( matchcountMax >= 250 )
+        {
+        return FALSE;
+        }
+
+    ++matchcount;
+
+    if ( matchcountMax < matchcount )
+        {
+        matchcountMax = matchcount;
+        }
+        
+    err = match_internal(eptr, ecode, offset_top, md, ims, eptrb, flags);
+
+    --matchcount;
+    if ( matchcount <= 0 )
+        {
+        matchcountMax = 0;
+        }
+
+    return err;
+}
+#endif  // end of NOKIA_CHANGES
+
+/*************************************************
+*         Match from current position            *
+*************************************************/
+
+/* On entry ecode points to the first opcode, and eptr to the first character
+in the subject string, while eptrb holds the value of eptr at the start of the
+last bracketed group - used for breaking infinite loops matching zero-length
+strings.
+
+Arguments:
+   eptr        pointer in subject
+   ecode       position in code
+   offset_top  current top pointer
+   md          pointer to "static" info for the match
+   ims         current /i, /m, and /s options
+   eptrb       pointer to chain of blocks containing eptr at start of
+                 brackets - for testing for empty matches
+   flags       can contain
+                 match_condassert - this is an assertion condition
+                 match_isgroup - this is the start of a bracketed group
+
+Returns:       TRUE if matched
+*/
+
+#if NOKIA_CHANGES
+static BOOL
+match_internal(register const ichar *eptr, register const uschar *ecode,
+  int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
+  int flags)
+#else
+match(register const ichar *eptr, register const uschar *ecode,
+  int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
+  int flags)
+#endif
+{
+
 unsigned long int original_ims = ims;   /* Save for resetting on ')' */
 eptrblock newptrb;
@@ -4532 +4601 @@
           ichar c1 = *ecode++;
 #endif
-                        {
+            {
           ichar c2 = *eptr++;
           if (MAPCHAR(md->lcc, c1) != MAPCHAR(md->lcc, c2))
             return FALSE;
           }
-                  }
+          }
         }
       else
@@ -4623 +4692 @@
           if (i >= max || eptr >= md->end_subject)
             return FALSE;
-                        {
+            {
           ichar c2 = *eptr++;
           if (c != MAPCHAR(md->lcc, c2))
             return FALSE;
-                        }
+            }
           }
         /* Control never gets here */
@@ -4683 +4752 @@
     case OP_NOT: {
     if (eptr >= md->end_subject) return FALSE;
-          {
+      {
 #if PCRE_UTF16
     int c = (ecode[1] << 8) | ecode[2];
@@ -4701 +4770 @@
       }
     }
-          }
+      }
     break;
 
@@ -4776 +4845 @@
           if (i >= max || eptr >= md->end_subject)
             return FALSE;
-                        {
+            {
           ichar c2 = *eptr++;
           if (c == MAPCHAR(md->lcc, c2))
             return FALSE;
-                        }
+            }
           }
         /* Control never gets here */