summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2016-03-28 18:19:49 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2016-03-31 17:13:42 -0400
commit5f619d882f9291684c500408ee54967f93d2da49 (patch)
treea08d2e6fde0688e9fe7a2202dc39127d3e700503
parentada50f9f409afdccb40038b3ba182bf4e81e0490 (diff)
downloadmongo-5f619d882f9291684c500408ee54967f93d2da49.tar.gz
SERVER-23277 Update LDR branch range check
-rw-r--r--src/mongo/util/processinfo_windows.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/util/processinfo_windows.cpp b/src/mongo/util/processinfo_windows.cpp
index e39fa6778da..7fa9a7e3943 100644
--- a/src/mongo/util/processinfo_windows.cpp
+++ b/src/mongo/util/processinfo_windows.cpp
@@ -216,6 +216,9 @@ bool getFileVersion(const char* filePath, DWORD& fileVersionMS, DWORD& fileVersi
// If the version of the ntfs.sys driver shows that the KB2731284 hotfix or a later update
// is installed, zeroing out data files is unnecessary. The file version numbers used below
// are taken from the Hotfix File Information at http://support.microsoft.com/kb/2731284.
+// In https://support.microsoft.com/en-us/kb/3121255, the LDR branch prefix for SP1 is now
+// .23xxxx since patch numbers have rolled over to the next range.
+// Windows 7 RTM has not received patches for KB3121255.
bool isKB2731284OrLaterUpdateInstalled() {
UINT pathBufferSize = GetSystemDirectoryA(NULL, 0);
if (pathBufferSize == 0) {
@@ -257,7 +260,7 @@ bool isKB2731284OrLaterUpdateInstalled() {
return true;
} else if (fileVersionFirstNumber == 6 && fileVersionSecondNumber == 1 &&
fileVersionThirdNumber == 7601 && fileVersionFourthNumber >= 22083 &&
- fileVersionFourthNumber <= 22999) {
+ fileVersionFourthNumber <= 23999) {
return true;
}
}