better Database name check SERVER-1218

1 files changed, 3 insertions, 1 deletions

diff --git a/db/database.cpp b/db/database.cpp
index 8bf865b537f..477332c5515 100644
--- a/db/database.cpp
+++ b/db/database.cpp
@@ -62,7 +62,9 @@ namespace mongo {
     }
 
     bool Database::validDBName( const string& ns ){
-        size_t good = strcspn( ns.c_str() , "/\\." );
+        if ( ns.size() == 0 || ns.size() > 64 )
+            return false;
+        size_t good = strcspn( ns.c_str() , "/\\. " );
         return good == ns.size();
     }