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:42:56 -0400
commit827c67a4d3c72a230a9af264c0e32f9d9a224866 (patch)
treef3b0f3a2b8ec553a4c8597e6e932ad13fe6a2277
parentf70872dbe3ea24e0e85fb5f969134c345e8ce737 (diff)
downloadmongo-827c67a4d3c72a230a9af264c0e32f9d9a224866.tar.gz
SERVER-23277 Update LDR branch range check
(cherry picked from commit 5f619d882f9291684c500408ee54967f93d2da49)
-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 224cd5a896a..87374503d37 100644
--- a/src/mongo/util/processinfo_windows.cpp
+++ b/src/mongo/util/processinfo_windows.cpp
@@ -201,6 +201,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) {
@@ -242,7 +245,7 @@ bool isKB2731284OrLaterUpdateInstalled() {
return true;
} else if (fileVersionFirstNumber == 6 && fileVersionSecondNumber == 1 &&
fileVersionThirdNumber == 7601 && fileVersionFourthNumber >= 22083 &&
- fileVersionFourthNumber <= 22999) {
+ fileVersionFourthNumber <= 23999) {
return true;
}
}