Compare commits

..

2 Commits

Author SHA1 Message Date
Enrico Giordani
ffa8eb4c92 [Release] 2.8.2401 2016-06-21 10:24:20 +02:00
Bastian Kröger
3e5cd0f1fb [PR] Fixed pointer overflow crash when using bgsave under rare circumstances.
(cherry picked from commit 07070076d1)
2016-06-21 09:23:28 +02:00
7 changed files with 12 additions and 9 deletions

View File

@@ -1,5 +1,9 @@
MSOpenTech Redis on Windows 2.8 Release Notes
=============================================
--[ Redis on Windows 2.8.2401 ] Release date: Jun 21 2016
- [PR] Fixed pointer overflow crash when using bgsave under rare circumstances.
--[ Redis on Windows 2.8.2400 ] Release date: Jan 21 2016
- Merged tag 2.8.24 from antirez/2.8

View File

@@ -1,4 +1,4 @@
version: 2.8.2104.{build}
version: 2.8.2401.{build}
branches:
# whitelist

View File

@@ -21,7 +21,7 @@
<Product Id="*"
Name="Redis on Windows"
Language="1033"
Version="2.8.2400"
Version="2.8.2401"
Manufacturer="MSOpenTech"
UpgradeCode="{05410198-7212-4FC4-B7C8-AFEFC3DA0FBC}">
<Package InstallerVersion="200"

View File

@@ -3,7 +3,7 @@
<metadata>
<id>redis-64</id>
<title>Redis 64-bit</title>
<version>2.8.2400</version>
<version>2.8.2401</version>
<authors>Alexis Campailla, Enrico Giordani, Jonathan Pickett</authors>
<owners>Microsoft Open Technologies, Inc.</owners>
<description>A porting of Redis on Windows 64-bit.

View File

@@ -3,7 +3,7 @@
<metadata>
<id>redis-64</id>
<title>Redis 64-bit</title>
<version>2.8.2400</version>
<version>2.8.2401</version>
<authors>Alexis Campailla, Enrico Giordani, Jonathan Pickett</authors>
<owners>Microsoft Open Technologies, Inc.</owners>
<description>A porting of Redis on Windows 64-bit.

View File

@@ -38,10 +38,9 @@ void EnsureMemoryIsMapped(const void *buffer, size_t size) {
if ((size_t) (pEnd - pStart) > Globals::pageSize) {
size_t offset = 0;
while (offset < size) {
if (size < offset) {
offset += Globals::pageSize;
if (offset > size) {
offset = size;
} else {
offset += Globals::pageSize;
}
c = *((char*) (p + offset));
}
@@ -62,4 +61,4 @@ bool IsWindowsVersionAtLeast(WORD wMajorVersion, WORD wMinorVersion, WORD wServi
osvi.wServicePackMajor = wServicePackMajor;
return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
}
}

View File

@@ -1 +1 @@
#define REDIS_VERSION "2.8.2400"
#define REDIS_VERSION "2.8.2401"