SERVER-10518: disallow _id field arrays and undefined

1 files changed, 3 insertions, 0 deletions

diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 11ec82eaa8e..83f763fa06a 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -863,8 +863,11 @@ namespace mongo {
                          e.fieldName()[0] != '$' );
 
                 // check no regexp for _id (SERVER-9502)
+                // also, disallow undefined and arrays
                 if (str::equals(e.fieldName(), "_id")) {
                     uassert(16824, "can't use a regex for _id", e.type() != RegEx);
+                    uassert(17150, "can't use undefined for _id", e.type() != Undefined);
+                    uassert(17151, "can't use an array for _id", e.type() != Array);
                 }
             }
         }