diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-16 09:26:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-16 09:26:48 (GMT) |
| commit | 006451f3a30a93e9563be866b9fe810ac385e6b5 (patch) | |
| tree | 7bcb9e941764ebfc242e278587ff9a7cc1a0e86a /generic/tclZipfs.c | |
| parent | 2e8db9a108c3539b68e894749c0e05e1d5ae871e (diff) | |
| parent | 0013597b33c5df5a4239d2fc042d9eeb597e94e0 (diff) | |
| download | tcl-006451f3a30a93e9563be866b9fe810ac385e6b5.zip tcl-006451f3a30a93e9563be866b9fe810ac385e6b5.tar.gz tcl-006451f3a30a93e9563be866b9fe810ac385e6b5.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclZipfs.c')
| -rw-r--r-- | generic/tclZipfs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 9dcfb4a..97ae17a 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -1449,9 +1449,8 @@ ZipFSCatalogFilesystem( * Validate the TOC data. If that's bad, things fall apart. */ - if (zf0->baseOffset < 0 || zf0->baseOffset >= zf0->length || - zf0->passOffset < 0 || zf0->passOffset >= zf0->length || - zf0->directoryOffset < 0 || zf0->directoryOffset >= zf0->length) { + if (zf0->baseOffset >= zf0->length || zf0->passOffset >= zf0->length || + zf0->directoryOffset >= zf0->length) { ZIPFS_ERROR(interp, "bad zip data"); ZIPFS_ERROR_CODE(interp, "BAD_ZIP"); return TCL_ERROR; @@ -3733,7 +3732,7 @@ TclZipfs_TclLibrary(void) #if !defined(STATIC_BUILD) #if defined(_WIN32) || defined(__CYGWIN__) - hModule = TclWinGetTclInstance(); + hModule = (HMODULE)TclWinGetTclInstance(); GetModuleFileNameW(hModule, wName, MAX_PATH); #ifdef __CYGWIN__ cygwin_conv_path(3, wName, dllName, sizeof(dllName)); |