database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Fix bug causing a crash when writing to a memory mapped file on Linux.

Browse Source 
modified:
  storage/connect/maputil.cpp
This commit is contained in:
Olivier Bertrand
2013-03-07 22:56:52 +01:00
parent 44efd72977
commit 079f053c66
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
storage/connect/maputil.cpp
View File

@@ -117,6 +117,7 @@ HANDLE CreateFileMap(PGLOBAL g, LPCSTR fileName,
MEMMAP *mm, MODE mode, bool del) MEMMAP *mm, MODE mode, bool del)
{ {
unsigned int openMode; unsigned int openMode;
int protmode;
HANDLE fd; HANDLE fd;
size_t filesize; size_t filesize;
struct stat st; struct stat st;
@@ -127,13 +128,16 @@ HANDLE CreateFileMap(PGLOBAL g, LPCSTR fileName,
switch (mode) { switch (mode) {
case MODE_READ: case MODE_READ:
openMode = O_RDONLY; openMode = O_RDONLY;
protmode = PROT_READ;
break; break;
case MODE_UPDATE: case MODE_UPDATE:
case MODE_DELETE: case MODE_DELETE:
openMode = (del) ? (O_RDWR | O_TRUNC) : O_RDWR; openMode = (del) ? (O_RDWR | O_TRUNC) : O_RDWR;
protmode = PROT_WRITE;
break; break;
case MODE_INSERT: case MODE_INSERT:
openMode = (O_WRONLY | O_CREAT | O_APPEND); openMode = (O_WRONLY | O_CREAT | O_APPEND);
protmode = PROT_WRITE;
break; break;
default: default:
sprintf(g->Message, MSG(BAD_FUNC_MODE), "CreateFileMap", mode); sprintf(g->Message, MSG(BAD_FUNC_MODE), "CreateFileMap", mode);
@@ -155,13 +159,18 @@ HANDLE CreateFileMap(PGLOBAL g, LPCSTR fileName,
// Now we are ready to load the file. If mmap() is available we try // Now we are ready to load the file. If mmap() is available we try
// this first. If not available or it failed we try to load it. // this first. If not available or it failed we try to load it.
mm->memory = mmap(NULL, filesize, PROT_READ, MAP_PRIVATE, fd, 0); mm->memory = mmap(NULL, filesize, protmode, MAP_PRIVATE, fd, 0);
mm->lenL = (mm->memory != 0) ? filesize : 0;
mm->lenH = 0; if (mm->memory) {
mm->lenL = (mm->memory != 0) ? filesize : 0;
mm->lenH = 0;
} else {
strcpy(g->Message, "Memory mapping failed");
return INVALID_HANDLE_VALUE;
} /* endif fd */ } /* endif fd */
// mmap() call was successful. ?????????? // mmap() call was successful. ??????????
return fd; return fd;
} // end of CreateFileMap } // end of CreateFileMap
bool CloseMemMap(void *memory, size_t dwSize) bool CloseMemMap(void *memory, size_t dwSize)