Import wiredtiger: a7b548cc6c470847c09eae6236a6cf209ba239f5 from branch mongodb-master

ref: 0f37ab9c11..a7b548cc6c
for: 5.2.0

WT-8389       Coverity analysis defect 121099: Untrusted loop bound

2 files changed, 29 insertions, 19 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 23c83e87688..5385c731bb0 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "0f37ab9c11fef6a3da0ad42257ac6f6e549bd0d1"
+    "commit": "a7b548cc6c470847c09eae6236a6cf209ba239f5"
 }
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index e2f65000e44..b17c0aa9c2a 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -1250,7 +1250,7 @@ void
 config_file(const char *name)
 {
     FILE *fp;
-    char buf[256], *p, *t;
+    char buf[256], *p;
 
     /*
      * Turn off multi-table configuration for all configuration files, for backward compatibility.
@@ -1266,29 +1266,39 @@ config_file(const char *name)
         testutil_die(errno, "fopen: %s", name);
 
     /*
-     * Skip leading Evergreen timestamps by skipping up to a closing brace and following whitespace.
-     * This is a little fragile: we're in trouble if Evergreen changes its timestamp format or if
-     * this program includes closing braces in its commands.
+     * Skip whitespace leading up to the configuration. Skip Evergreen timestamps by skipping a pair
+     * of enclosing braces and trailing whitespace. This is fragile: we're in trouble if Evergreen
+     * changes its timestamp format.
      */
     while (fgets(buf, sizeof(buf), fp) != NULL) {
-        for (p = t = buf; *p != '\0'; ++p) {
-            if (*p == '\n') { /* Configuration end. */
+        /* Replace any newline character. */
+        for (p = buf; *p != '\0'; ++p)
+            if (*p == '\n') {
                 *p = '\0';
                 break;
             }
-            if (*p == '#') { /* Comment */
-                t = p;
+
+        /* Skip any leading whitespace. */
+        for (p = buf; *p != '\0'; ++p)
+            if (!isblank(*p))
                 break;
-            }
-            if (t == buf && *p == ']') { /* Closing brace, configuration starts after it. */
-                while (isblank((unsigned char)*++p))
-                    ;
-                t = p--;
-            }
-        }
-        if (*t == '\0' || *t == '#')
-            continue;
-        config_single(NULL, t, true);
+
+        /* Skip any Evergreen timestamp. */
+        if (*p == '[')
+            for (; *p != '\0'; ++p)
+                if (*p == ']') {
+                    ++p;
+                    break;
+                }
+
+        /* Skip any trailing whitespace. */
+        for (; *p != '\0'; ++p)
+            if (!isblank(*p))
+                break;
+
+        /* Skip any comments or empty lines. */
+        if (*p != '\0' && *p != '#')
+            config_single(NULL, p, true);
     }
     fclose_and_clear(&fp);
 }