Show
Ignore:
Timestamp:
10/19/07 04:35:35 (13 months ago)
Author:
alex
Message:

ensure that functions inside arrays don't blow up under shrinksafe. Fixes #4574

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • util/trunk/shrinksafe/custom_rhino.diff

    r10634 r10980  
    55diff -u -8 -p -r1.63 BaseFunction.java 
    66--- src/org/mozilla/javascript/BaseFunction.java        16 May 2007 12:41:00 -0000      1.63 
    7 +++ src/org/mozilla/javascript/BaseFunction.java        27 Sep 2007 16:54:23 -0000 
     7+++ src/org/mozilla/javascript/BaseFunction.java        19 Oct 2007 11:28:27 -0000 
    88@@ -371,16 +371,38 @@ public class BaseFunction extends IdScri 
    99         sb.append(getArity()); 
    … …  
    5151diff -u -8 -p -r1.255.2.1 Context.java 
    5252--- src/org/mozilla/javascript/Context.java     6 Jun 2007 14:58:49 -0000       1.255.2.1 
    53 +++ src/org/mozilla/javascript/Context.java     27 Sep 2007 16:54:24 -0000 
     53+++ src/org/mozilla/javascript/Context.java     19 Oct 2007 11:28:27 -0000 
    5454@@ -1211,16 +1211,43 @@ public class Context 
    5555      * @param securityDomain an arbitrary object that specifies security 
    … …  
    176176diff -u -8 -p -r1.23 Decompiler.java 
    177177--- src/org/mozilla/javascript/Decompiler.java  4 Apr 2007 20:52:09 -0000       1.23 
    178 +++ src/org/mozilla/javascript/Decompiler.java  27 Sep 2007 16:54:25 -0000 
     178+++ src/org/mozilla/javascript/Decompiler.java  19 Oct 2007 11:28:28 -0000 
    179179@@ -36,16 +36,21 @@ 
    180180  * them with the notice and other provisions required by the GPL. If you do 
    … …  
    482482     public static final int ONLY_BODY_FLAG = 1 << 0; 
    483483  
    484 @@ -265,16 +536,535 @@ public class Decompiler 
     484@@ -265,16 +536,536 @@ public class Decompiler 
    485485     } 
    486486  
    … …  
    650650+                            (getNext(encodedSource, length, i+1) != Token.LP) && 
    651651+                            (getNext(encodedSource, length, i+1) != Token.RP) && 
     652+                            (getNext(encodedSource, length, i+1) != Token.RB) && 
    652653+                            (getNext(encodedSource, length, i+1) != Token.RC) && 
    653654+                            (getNext(encodedSource, length, i+1) != Token.COMMA) && 
    … …  
    10241025diff -u -8 -p -r1.65 NativeFunction.java 
    10251026--- src/org/mozilla/javascript/NativeFunction.java      24 May 2007 14:47:01 -0000      1.65 
    1026 +++ src/org/mozilla/javascript/NativeFunction.java      27 Sep 2007 16:54:25 -0000 
     1027+++ src/org/mozilla/javascript/NativeFunction.java      19 Oct 2007 11:28:28 -0000 
    10271028@@ -69,16 +69,36 @@ public abstract class NativeFunction ext 
    10281029             return super.decompile(indent, flags); 
    … …  
    10681069diff -u -8 -p -r1.263.2.3 ScriptRuntime.java 
    10691070--- src/org/mozilla/javascript/ScriptRuntime.java       18 Jul 2007 12:45:45 -0000      1.263.2.3 
    1070 +++ src/org/mozilla/javascript/ScriptRuntime.java       27 Sep 2007 16:54:27 -0000 
     1071+++ src/org/mozilla/javascript/ScriptRuntime.java       19 Oct 2007 11:28:28 -0000 
    10711072@@ -642,32 +642,35 @@ public class ScriptRuntime { 
    10721073             if (escape >= 0) { 
    … …  
    11111112diff -u -8 -p -r1.66 TokenStream.java 
    11121113--- src/org/mozilla/javascript/TokenStream.java 4 Apr 2007 20:52:12 -0000       1.66 
    1113 +++ src/org/mozilla/javascript/TokenStream.java 27 Sep 2007 16:54:28 -0000 
     1114+++ src/org/mozilla/javascript/TokenStream.java 19 Oct 2007 11:28:28 -0000 
    11141115@@ -63,19 +63,22 @@ class TokenStream 
    11151116     /* 
    … …  
    11601161diff -u -8 -p -r1.27.2.2.2.1 Messages.properties 
    11611162--- toolsrc/org/mozilla/javascript/tools/resources/Messages.properties  9 Aug 2007 13:17:37 -0000       1.27.2.2.2.1 
    1162 +++ toolsrc/org/mozilla/javascript/tools/resources/Messages.properties  27 Sep 2007 16:54:29 -0000 
     1163+++ toolsrc/org/mozilla/javascript/tools/resources/Messages.properties  19 Oct 2007 11:28:28 -0000 
    11631164@@ -60,16 +60,18 @@ msg.shell.usage =\ 
    11641165     Valid options are:\n\ 
    … …  
    11861187diff -u -8 -p -r1.72 Main.java 
    11871188--- toolsrc/org/mozilla/javascript/tools/shell/Main.java        4 Jun 2007 13:46:58 -0000       1.72 
    1188 +++ toolsrc/org/mozilla/javascript/tools/shell/Main.java        27 Sep 2007 16:54:29 -0000 
     1189+++ toolsrc/org/mozilla/javascript/tools/shell/Main.java        19 Oct 2007 11:28:28 -0000 
    11891190@@ -64,16 +64,21 @@ public class Main 
    11901191         shellContextFactory = new ShellContextFactory();