Mercurial > hg > orthanc

comparison OrthancFramework/Resources/ThirdParty/minizip/ioapi.c @ 5428:8174e45f48d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgraded minizip library to stay away from CVE-2023-45853
author Alain Mazy <am@osimis.io>
date Fri, 17 Nov 2023 08:58:40 +0100
parents d25f4c0fa160
children
comparison
equal deleted inserted replaced
5427:111e21b4f8bc 5428:8174e45f48d8
12 12
13 #if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS))) 13 #if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
14 #define _CRT_SECURE_NO_WARNINGS 14 #define _CRT_SECURE_NO_WARNINGS
15 #endif 15 #endif
16 16
17 #if defined(__APPLE__) || defined(IOAPI_NO_64) 17 #if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
18 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions 18 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
19 #define FOPEN_FUNC(filename, mode) fopen(filename, mode) 19 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
20 #define FTELLO_FUNC(stream) ftello(stream) 20 #define FTELLO_FUNC(stream) ftello(stream)
21 #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) 21 #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
22 #else 22 #else
26 #endif 26 #endif
27 27
28 28
29 #include "ioapi.h" 29 #include "ioapi.h"
30 30
31 voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) 31 voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc, const void*filename, int mode) {
32 {
33 if (pfilefunc->zfile_func64.zopen64_file != NULL) 32 if (pfilefunc->zfile_func64.zopen64_file != NULL)
34 return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode); 33 return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
35 else 34 else
36 { 35 {
37 return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode); 36 return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
38 } 37 }
39 } 38 }
40 39
41 long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin) 40 long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin) {
42 {
43 if (pfilefunc->zfile_func64.zseek64_file != NULL) 41 if (pfilefunc->zfile_func64.zseek64_file != NULL)
44 return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin); 42 return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
45 else 43 else
46 { 44 {
47 uLong offsetTruncated = (uLong)offset; 45 uLong offsetTruncated = (uLong)offset;
50 else 48 else
51 return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin); 49 return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
52 } 50 }
53 } 51 }
54 52
55 ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream) 53 ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc, voidpf filestream) {
56 {
57 if (pfilefunc->zfile_func64.zseek64_file != NULL) 54 if (pfilefunc->zfile_func64.zseek64_file != NULL)
58 return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream); 55 return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
59 else 56 else
60 { 57 {
61 uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream); 58 uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
62 if ((tell_uLong) == MAXU32) 59 if ((tell_uLong) == MAXU32)
63 return (ZPOS64_T)-1; 60 return (ZPOS64_T)-1;
64 else 61 else
65 return tell_uLong; 62 return tell_uLong;
66 } 63 }
67 } 64 }
68 65
69 void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32) 66 void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32, const zlib_filefunc_def* p_filefunc32) {
70 {
71 p_filefunc64_32->zfile_func64.zopen64_file = NULL; 67 p_filefunc64_32->zfile_func64.zopen64_file = NULL;
72 p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file; 68 p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
73 p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
74 p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file; 69 p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
75 p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file; 70 p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
76 p_filefunc64_32->zfile_func64.ztell64_file = NULL; 71 p_filefunc64_32->zfile_func64.ztell64_file = NULL;
77 p_filefunc64_32->zfile_func64.zseek64_file = NULL; 72 p_filefunc64_32->zfile_func64.zseek64_file = NULL;
78 p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file; 73 p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
82 p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file; 77 p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
83 } 78 }
84 79
85 80
86 81
87 static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode)); 82 static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char* filename, int mode) {
88 static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
89 static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
90 static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
91 static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
92 static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
93 static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
94
95 static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
96 {
97 FILE* file = NULL; 83 FILE* file = NULL;
98 const char* mode_fopen = NULL; 84 const char* mode_fopen = NULL;
85 (void)opaque;
99 if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) 86 if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
100 mode_fopen = "rb"; 87 mode_fopen = "rb";
101 else 88 else
102 if (mode & ZLIB_FILEFUNC_MODE_EXISTING) 89 if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
103 mode_fopen = "r+b"; 90 mode_fopen = "r+b";
108 if ((filename!=NULL) && (mode_fopen != NULL)) 95 if ((filename!=NULL) && (mode_fopen != NULL))
109 file = fopen(filename, mode_fopen); 96 file = fopen(filename, mode_fopen);
110 return file; 97 return file;
111 } 98 }
112 99
113 static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode) 100 static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, int mode) {
114 {
115 FILE* file = NULL; 101 FILE* file = NULL;
116 const char* mode_fopen = NULL; 102 const char* mode_fopen = NULL;
103 (void)opaque;
117 if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) 104 if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
118 mode_fopen = "rb"; 105 mode_fopen = "rb";
119 else 106 else
120 if (mode & ZLIB_FILEFUNC_MODE_EXISTING) 107 if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
121 mode_fopen = "r+b"; 108 mode_fopen = "r+b";
127 file = FOPEN_FUNC((const char*)filename, mode_fopen); 114 file = FOPEN_FUNC((const char*)filename, mode_fopen);
128 return file; 115 return file;
129 } 116 }
130 117
131 118
132 static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) 119 static uLong ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uLong size) {
133 {
134 uLong ret; 120 uLong ret;
121 (void)opaque;
135 ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); 122 ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
136 return ret; 123 return ret;
137 } 124 }
138 125
139 static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size) 126 static uLong ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void* buf, uLong size) {
140 {
141 uLong ret; 127 uLong ret;
128 (void)opaque;
142 ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); 129 ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
143 return ret; 130 return ret;
144 } 131 }
145 132
146 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) 133 static long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream) {
147 {
148 long ret; 134 long ret;
135 (void)opaque;
149 ret = ftell((FILE *)stream); 136 ret = ftell((FILE *)stream);
150 return ret; 137 return ret;
151 } 138 }
152 139
153 140
154 static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream) 141 static ZPOS64_T ZCALLBACK ftell64_file_func(voidpf opaque, voidpf stream) {
155 {
156 ZPOS64_T ret; 142 ZPOS64_T ret;
157 ret = FTELLO_FUNC((FILE *)stream); 143 (void)opaque;
158 return ret; 144 ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
159 } 145 return ret;
160 146 }
161 static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) 147
162 { 148 static long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uLong offset, int origin) {
163 int fseek_origin=0; 149 int fseek_origin=0;
164 long ret; 150 long ret;
151 (void)opaque;
165 switch (origin) 152 switch (origin)
166 { 153 {
167 case ZLIB_FILEFUNC_SEEK_CUR : 154 case ZLIB_FILEFUNC_SEEK_CUR :
168 fseek_origin = SEEK_CUR; 155 fseek_origin = SEEK_CUR;
169 break; 156 break;
174 fseek_origin = SEEK_SET; 161 fseek_origin = SEEK_SET;
175 break; 162 break;
176 default: return -1; 163 default: return -1;
177 } 164 }
178 ret = 0; 165 ret = 0;
179 if (fseek((FILE *)stream, offset, fseek_origin) != 0) 166 if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0)
180 ret = -1; 167 ret = -1;
181 return ret; 168 return ret;
182 } 169 }
183 170
184 static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) 171 static long ZCALLBACK fseek64_file_func(voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) {
185 {
186 int fseek_origin=0; 172 int fseek_origin=0;
187 long ret; 173 long ret;
174 (void)opaque;
188 switch (origin) 175 switch (origin)
189 { 176 {
190 case ZLIB_FILEFUNC_SEEK_CUR : 177 case ZLIB_FILEFUNC_SEEK_CUR :
191 fseek_origin = SEEK_CUR; 178 fseek_origin = SEEK_CUR;
192 break; 179 break;
198 break; 185 break;
199 default: return -1; 186 default: return -1;
200 } 187 }
201 ret = 0; 188 ret = 0;
202 189
203 if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0) 190 if(FSEEKO_FUNC((FILE *)stream, (z_off64_t)offset, fseek_origin) != 0)
204 ret = -1; 191 ret = -1;
205 192
206 return ret; 193 return ret;
207 } 194 }
208 195
209 196
210 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) 197 static int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream) {
211 {
212 int ret; 198 int ret;
199 (void)opaque;
213 ret = fclose((FILE *)stream); 200 ret = fclose((FILE *)stream);
214 return ret; 201 return ret;
215 } 202 }
216 203
217 static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) 204 static int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream) {
218 {
219 int ret; 205 int ret;
206 (void)opaque;
220 ret = ferror((FILE *)stream); 207 ret = ferror((FILE *)stream);
221 return ret; 208 return ret;
222 } 209 }
223 210
224 void fill_fopen_filefunc (pzlib_filefunc_def) 211 void fill_fopen_filefunc(zlib_filefunc_def* pzlib_filefunc_def) {
225 zlib_filefunc_def* pzlib_filefunc_def;
226 {
227 pzlib_filefunc_def->zopen_file = fopen_file_func; 212 pzlib_filefunc_def->zopen_file = fopen_file_func;
228 pzlib_filefunc_def->zread_file = fread_file_func; 213 pzlib_filefunc_def->zread_file = fread_file_func;
229 pzlib_filefunc_def->zwrite_file = fwrite_file_func; 214 pzlib_filefunc_def->zwrite_file = fwrite_file_func;
230 pzlib_filefunc_def->ztell_file = ftell_file_func; 215 pzlib_filefunc_def->ztell_file = ftell_file_func;
231 pzlib_filefunc_def->zseek_file = fseek_file_func; 216 pzlib_filefunc_def->zseek_file = fseek_file_func;
232 pzlib_filefunc_def->zclose_file = fclose_file_func; 217 pzlib_filefunc_def->zclose_file = fclose_file_func;
233 pzlib_filefunc_def->zerror_file = ferror_file_func; 218 pzlib_filefunc_def->zerror_file = ferror_file_func;
234 pzlib_filefunc_def->opaque = NULL; 219 pzlib_filefunc_def->opaque = NULL;
235 } 220 }
236 221
237 void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def) 222 void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def) {
238 {
239 pzlib_filefunc_def->zopen64_file = fopen64_file_func; 223 pzlib_filefunc_def->zopen64_file = fopen64_file_func;
240 pzlib_filefunc_def->zread_file = fread_file_func; 224 pzlib_filefunc_def->zread_file = fread_file_func;
241 pzlib_filefunc_def->zwrite_file = fwrite_file_func; 225 pzlib_filefunc_def->zwrite_file = fwrite_file_func;
242 pzlib_filefunc_def->ztell64_file = ftell64_file_func; 226 pzlib_filefunc_def->ztell64_file = ftell64_file_func;
243 pzlib_filefunc_def->zseek64_file = fseek64_file_func; 227 pzlib_filefunc_def->zseek64_file = fseek64_file_func;