CSHARP-670: ObjectId constructor and Pack method should throw ArgumentOutOfRangeException if machine or increment values are invalid.

Author: rstam

MongoDB.Bson/ObjectModel/ObjectId.cs

@@ -95,6 +95,15 @@ public ObjectId(DateTime timestamp, int machine, short pid, int increment)
         /// <param name="increment">The increment.</param>
         public ObjectId(int timestamp, int machine, short pid, int increment)
         {
+            if ((machine & 0xff000000) != 0)
+            {
+                throw new ArgumentOutOfRangeException("machine", "The machine value must be between 0 and 16777215 (it must fit in 3 bytes).");
+            }
+            if ((increment & 0xff000000) != 0)
+            {
+                throw new ArgumentOutOfRangeException("increment", "The increment value must be between 0 and 16777215 (it must fit in 3 bytes).");
+            }
+
             _timestamp = timestamp;
             _machine = machine;
             _pid = pid;
@@ -272,6 +281,15 @@ public static ObjectId GenerateNewId(int timestamp)
         /// <returns>A byte array.</returns>
         public static byte[] Pack(int timestamp, int machine, short pid, int increment)
         {
+            if ((machine & 0xff000000) != 0)
+            {
+                throw new ArgumentOutOfRangeException("machine", "The machine value must be between 0 and 16777215 (it must fit in 3 bytes).");
+            }
+            if ((increment & 0xff000000) != 0)
+            {
+                throw new ArgumentOutOfRangeException("increment", "The increment value must be between 0 and 16777215 (it must fit in 3 bytes).");
+            }
+
             byte[] bytes = new byte[12];
             bytes[0] = (byte)(timestamp >> 24);
             bytes[1] = (byte)(timestamp >> 16);

MongoDB.BsonUnitTests/ObjectModel/ObjectIdTests.cs

@@ -57,6 +57,38 @@ public void TestIntIntShortIntConstructor()
             Assert.IsTrue(bytes.SequenceEqual(objectId.ToByteArray()));
         }
 
+        [Test]
+        public void TestIntIntShortIntConstructorWithInvalidIncrement()
+        {
+            var objectId = new ObjectId(0, 0, 0, 0x00ffffff);
+            Assert.AreEqual(0x00ffffff, objectId.Increment);
+            Assert.Throws<ArgumentOutOfRangeException>(() => { var invalidId = new ObjectId(0, 0, 0, 0x01000000); });
+        }
+
+        [Test]
+        public void TestIntIntShortIntConstructorWithInvalidMachine()
+        {
+            var objectId = new ObjectId(0, 0x00ffffff, 0, 0);
+            Assert.AreEqual(0x00ffffff, objectId.Machine);
+            Assert.Throws<ArgumentOutOfRangeException>(() => { var invalidId = new ObjectId(0, 0x01000000, 0, 0); });
+        }
+
+        [Test]
+        public void TestPackWithInvalidIncrement()
+        {
+            var objectId = new ObjectId(ObjectId.Pack(0, 0, 0, 0x00ffffff));
+            Assert.AreEqual(0x00ffffff, objectId.Increment);
+            Assert.Throws<ArgumentOutOfRangeException>(() => { var invalidId = new ObjectId(ObjectId.Pack(0, 0, 0, 0x01000000)); });
+        }
+
+        [Test]
+        public void TestPackWithInvalidMachine()
+        {
+            var objectId = new ObjectId(ObjectId.Pack(0, 0x00ffffff, 0, 0));
+            Assert.AreEqual(0x00ffffff, objectId.Machine);
+            Assert.Throws<ArgumentOutOfRangeException>(() => { var invalidId = new ObjectId(ObjectId.Pack(0, 0x01000000, 0, 0)); });
+        }
+
         [Test]
         public void TestDateTimeConstructor()
         {