tighten array handling in relinkPrivateKeys

alexcjohnson · alexcjohnson · commit 5a3d2a6b4a6d · 2018-02-16T09:58:40.000-05:00
diff --git a/src/lib/relink_private.js b/src/lib/relink_private.js
@@ -43,8 +43,9 @@ module.exports = function relinkPrivateKeys(toContainer, fromContainer) {
             if(k === 'customdata' || k === 'ids') continue;
 
             // recurse into arrays containers
-            for(var j = 0; j < fromVal.length; j++) {
-                if(isPlainObject(fromVal[j]) && isPlainObject(toVal[j]) && (toVal[j] !== fromVal[j])) {
+            var minLen = Math.min(fromVal.length, toVal.length);
+            for(var j = 0; j < minLen; j++) {
+                if((toVal[j] !== fromVal[j]) && isPlainObject(fromVal[j]) && isPlainObject(toVal[j])) {
                     relinkPrivateKeys(toVal[j], fromVal[j]);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ module.exports = function relinkPrivateKeys(toContainer, fromContainer) {`
`43`	`43`	`if(k === 'customdata' \|\| k === 'ids') continue;`
`44`	`44`
`45`	`45`	`// recurse into arrays containers`
`46`		`- for(var j = 0; j < fromVal.length; j++) {`
`47`		`- if(isPlainObject(fromVal[j]) && isPlainObject(toVal[j]) && (toVal[j] !== fromVal[j])) {`
	`46`	`+ var minLen = Math.min(fromVal.length, toVal.length);`
	`47`	`+ for(var j = 0; j < minLen; j++) {`
	`48`	`+ if((toVal[j] !== fromVal[j]) && isPlainObject(fromVal[j]) && isPlainObject(toVal[j])) {`
`48`	`49`	`relinkPrivateKeys(toVal[j], fromVal[j]);`
`49`	`50`	`}`
`50`	`51`	`}`