SERVER-12978 more validation of write concern options

1 files changed, 18 insertions, 6 deletions

diff --git a/src/mongo/db/write_concern_options.cpp b/src/mongo/db/write_concern_options.cpp
index db18073a3ac..848c4e4464c 100644
--- a/src/mongo/db/write_concern_options.cpp
+++ b/src/mongo/db/write_concern_options.cpp
@@ -38,14 +38,26 @@ namespace mongo {
 
     Status WriteConcernOptions::parse( const BSONObj& obj ) {
         if ( obj.isEmpty() ) {
-            return Status( ErrorCodes::BadValue, "write concern object cannot be empty" );
+            return Status( ErrorCodes::FailedToParse, "write concern object cannot be empty" );
         }
 
-        bool j = obj["j"].trueValue();
-        bool fsync = obj["fsync"].trueValue();
+        BSONElement jEl = obj["j"];
+        if ( !jEl.eoo() && !jEl.isNumber() && jEl.type() != Bool ) {
+            return Status( ErrorCodes::FailedToParse, "j must be numeric or a boolean value" );
+        }
+
+        const bool j = jEl.trueValue();
+
+        BSONElement fsyncEl = obj["fsync"];
+        if ( !fsyncEl.eoo() && !fsyncEl.isNumber() && fsyncEl.type() != Bool ) {
+            return Status( ErrorCodes::FailedToParse, "fsync must be numeric or a boolean value" );
+        }
+
+        const bool fsync = fsyncEl.trueValue();
 
-        if ( j & fsync )
-            return Status( ErrorCodes::BadValue, "fsync and j options cannot be used together" );
+        if ( j && fsync )
+            return Status( ErrorCodes::FailedToParse,
+                           "fsync and j options cannot be used together" );
 
         if ( j ) {
             syncMode = JOURNAL;
@@ -67,7 +79,7 @@ namespace mongo {
             wNumNodes = 1;
         }
         else {
-            return Status( ErrorCodes::BadValue, "w has to be a number or a string" );
+            return Status( ErrorCodes::FailedToParse, "w has to be a number or a string" );
         }
 
         wTimeout = obj["wtimeout"].numberInt();