SERVER-8544 Disable having duplicate regex options in JSON parsing

2 files changed, 5 insertions, 1 deletions

diff --git a/src/mongo/bson/bsonelement.cpp b/src/mongo/bson/bsonelement.cpp
index 018b1f2e6e6..2ad980eb957 100644
--- a/src/mongo/bson/bsonelement.cpp
+++ b/src/mongo/bson/bsonelement.cpp
@@ -280,6 +280,7 @@ void BSONElement::jsonStringStream(JsonStringFormat format,
                         case 'g':
                         case 'i':
                         case 'm':
+                        case 's':
                             s << *f;
                         default:
                             break;
diff --git a/src/mongo/bson/json.cpp b/src/mongo/bson/json.cpp
index 8f6587a6eff..a2bc9872c79 100644
--- a/src/mongo/bson/json.cpp
+++ b/src/mongo/bson/json.cpp
@@ -993,10 +993,13 @@ Status JParse::regexOpt(std::string* result) {
 Status JParse::regexOptCheck(StringData opt) {
     MONGO_JSON_DEBUG("opt: " << opt);
     std::size_t i;
+    std::string availableOptions = JOPTIONS;
     for (i = 0; i < opt.size(); i++) {
-        if (!match(opt[i], JOPTIONS)) {
+        std::size_t availIndex = availableOptions.find(opt[i]);
+        if (availIndex == std::string::npos) {
             return parseError(string("Bad regex option: ") + opt[i]);
         }
+        availableOptions.erase(availIndex, 1);
     }
     return Status::OK();
 }