From 7f31be7cb11b45ead6e85d80985e234a1e7299f6 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Wed, 7 Sep 2011 16:18:08 +0100 Subject: [PATCH] Fixed: array replaceObjectsInRange:withObjectsFromArray: always failed with a "'null' is not an object' error. This was caused by the new range checks in f8404c7a97114ab40d67fe30e525d4cd5aeb6bd2. --- Foundation/CPArray/_CPJavaScriptArray.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/CPArray/_CPJavaScriptArray.j b/Foundation/CPArray/_CPJavaScriptArray.j index 7a84057bb..2cadc2113 100644 --- a/Foundation/CPArray/_CPJavaScriptArray.j +++ b/Foundation/CPArray/_CPJavaScriptArray.j @@ -259,7 +259,7 @@ var concat = Array.prototype.concat, if (aRange.location < 0 || CPMaxRange(aRange) > self.length) [CPException raise:CPRangeException reason:_cmd + " aRange out of bounds"]; - if (otherRange.location < 0 || CPMaxRange(otherRange) > anArray.length) + if (otherRange && (otherRange.location < 0 || CPMaxRange(otherRange) > anArray.length)) [CPException raise:CPRangeException reason:_cmd + " otherRange out of bounds"]; if (otherRange && (otherRange.location !== 0 || otherRange.length !== [anArray count]))