Fixed negative length index crash

orlandos-nl · May 17, 2017 · 0a92b8a · 0a92b8a
1 parent af89926
commit 0a92b8a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Sources/BSON/Document+Subscripts.swift b/Sources/BSON/Document+Subscripts.swift
@@ -121,9 +121,7 @@ extension Document {
                             searchTree[part] = nil
                         }
 
-                        let affectedPosition = relativeLength >= 0 ? meta.dataPosition : meta.dataPosition + relativeLength
-
-                        for (key, startPosition) in searchTree where startPosition > affectedPosition {
+                        for (key, startPosition) in searchTree where startPosition > meta.elementTypePosition {
                             searchTree[key] = startPosition + relativeLength
                         }
 

diff --git a/Tests/BSONTests/BSONPublicTests.swift b/Tests/BSONTests/BSONPublicTests.swift
@@ -62,6 +62,16 @@ final class BSONPublicTests: XCTestCase {
         "maxKey": MaxKey()
     ]
 
+    func testRelativeLength() {
+        var document: Document = [
+            "_id": ObjectId(),
+            "henk": ["$db": "kaas", "$sap": "saus"]
+        ]
+
+        document["henk"] = ObjectId()
+        XCTAssert(!document.validatesAsArray())
+    }
+
     func testNullToNilInt() {
         var doc: Document = [
             "_id": Null(),