Changeset 14742 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Jun 5, 2006, 10:59:43 PM (19 years ago)

Author:

ggaren

Message:

Reviewed and landed by Geoff.

• fix a regression in ecma_3/String/regress-104375.js

• kjs/string_object.cpp: (substituteBackreferences): If a 2-digit back reference is out of range, parse it as a 1-digit reference (followed by the other digit). This matches Firefox's behavior.

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -258 +258 @@
         // 1- and 2-digit back references are allowed
         unsigned backrefIndex = ref - '0';
+        if (backrefIndex > (unsigned)reg->subPatterns())
+            continue;
         if (substitutedReplacement.size() > i + 2) {
             ref = substitutedReplacement[i+2].unicode();
             if (ref >= '0' && ref <= '9') {
                 backrefIndex = 10 * backrefIndex + ref - '0';
-                advance = 1;
+                if (backrefIndex > (unsigned)reg->subPatterns())
+                    backrefIndex = backrefIndex / 10;   // Fall back to the 1-digit reference
+                else
+                    advance = 1;
             }
-        }
-        if (backrefIndex > (unsigned)reg->subPatterns()) {
-            i += advance;
-            continue;
         }
         backrefStart = ovector[2 * backrefIndex];