summaryrefslogtreecommitdiffstats
path: root/src/zziplib-1-fix-mmap.patch
blob: f95a691703989ffb6660299ec8bd691d6ae6abc6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
This file is part of MXE.
See index.html for further information.

This patch has been taken from:
http://sourceforge.net/tracker/?func=detail&aid=2995373&group_id=6389&atid=306389

--- zziplib-0.13.59/zzip/__mmap.h	2013-10-03 22:23:32.467619238 -0400
+++ zzip-patched/zzip/__mmap.h	2013-10-04 21:44:16.412881609 -0400
@@ -63,14 +63,15 @@
 	return 0;
   {
     HANDLE hFile = (HANDLE)_get_osfhandle(fd);
+    HANDLE fileMapping = NULL;
     if (hFile)
-	*user = (int) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL);
-    if (*user)
+	fileMapping = CreateFileMapping(hFile, 0, PAGE_READONLY, 0, 0, NULL);
+    if (fileMapping != NULL)
     {
 	char* p = 0;
-	p = MapViewOfFile(*(HANDLE*)user, FILE_MAP_READ, 0, offs, len);
-	if (p) return p + offs;
-	CloseHandle (*(HANDLE*)user); *user = 1;
+	p = MapViewOfFile(fileMapping, FILE_MAP_READ, 0, offs, len);
+	CloseHandle (fileMapping);
+	if (p) return p;
     } 
     return MAP_FAILED;
   }
@@ -78,7 +79,6 @@
 static void win32_munmap (long* user, char* fd_map, size_t len)
 {
     UnmapViewOfFile (fd_map);
-    CloseHandle (*(HANDLE*)user); *user = 1;
 }
 
 #define _zzip_mmap(user, fd, offs, len) \