Merge pull request requirejs#304 from lcbarcellos/patch-1

jrburke · jrburke · commit a95f6ead3a44 · 2012-11-19T17:41:41.000-08:00
Infinite loop potential in rhino/optimizer module
diff --git a/build/jslib/rhino/optimize.js b/build/jslib/rhino/optimize.js
@@ -21,13 +21,12 @@ define(['logger', 'env!env/file'], function (logger, file) {
             if (arguments.length >= 2) {
                 accumulator = arguments[1];
             } else {
-                do {
-                    if (i in this) {
-                        accumulator = this[i++];
-                        break;
+                if (length) {
+                    while (!(i in this)) {
+                        i++;
                     }
+                    accumulator = this[i++];
                 }
-                while (true);
             }
 
             for (; i < length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,12 @@ define(['logger', 'env!env/file'], function (logger, file) {`
`21`	`21`	`if (arguments.length >= 2) {`
`22`	`22`	`accumulator = arguments[1];`
`23`	`23`	`} else {`
`24`		`- do {`
`25`		`- if (i in this) {`
`26`		`- accumulator = this[i++];`
`27`		`- break;`
	`24`	`+ if (length) {`
	`25`	`+ while (!(i in this)) {`
	`26`	`+ i++;`
`28`	`27`	`}`
	`28`	`+ accumulator = this[i++];`
`29`	`29`	`}`
`30`		`- while (true);`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`for (; i < length; i++) {`