Fixup offset check

Author: SeanReece

src/objectid.ts

@@ -163,16 +163,16 @@ export class ObjectId extends BSONValue {
       // Generate a new id
       ObjectId.generate(typeof workingId === 'number' ? workingId : undefined, pool, offset);
     } else if (ArrayBuffer.isView(workingId)) {
-      if (workingId.byteLength !== 12 && typeof inputIndex !== 'number') {
-        throw new BSONError('Buffer length must be 12 or offset must be specified');
-      }
-      if (
-        inputIndex &&
-        (typeof inputIndex !== 'number' || inputIndex < 0 || workingId.byteLength < inputIndex + 12)
+      if (workingId.byteLength === 12) {
+        inputIndex = 0;
+      } else if (
+        typeof inputIndex !== 'number' ||
+        inputIndex < 0 ||
+        workingId.byteLength < inputIndex + 12 ||
+        isNaN(inputIndex)
       ) {
-        throw new BSONError('Buffer offset must be a non-negative number less than buffer length');
+        throw new BSONError('Buffer length must be 12 or a valid offset must be specified');
       }
-      inputIndex ??= 0;
       for (let i = 0; i < 12; i++) pool[offset + i] = workingId[inputIndex + i];
     } else if (typeof workingId === 'string') {
       if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {

test/node/object_id.test.ts

@@ -407,6 +407,13 @@ describe('ObjectId', function () {
   it('should throw an error if invalid Buffer offset passed in', function () {
     const a = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
     expect(() => new ObjectId(a, 5)).to.throw(BSONError);
+    expect(() => new ObjectId(a, -1)).to.throw(BSONError);
+    expect(() => new ObjectId(a, 0n)).to.throw(BSONError);
+    expect(() => new ObjectId(a, '')).to.throw(BSONError);
+    expect(() => new ObjectId(a, NaN)).to.throw(BSONError);
+    expect(() => new ObjectId(a, {})).to.throw(BSONError);
+    expect(() => new ObjectId(a, false)).to.throw(BSONError);
+    expect(() => new ObjectId(a, '' + 1)).to.throw(BSONError);
   });
 
   it('should correctly allow for node.js inspect to work with ObjectId', function (done) {