torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4

Browse Source
This commit is contained in:
Alexander Færøy
2020-07-29 13:57:47 +00:00
parent 0a38e02fb3 dcc60294ad
commit 8e690ce736
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug31036
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes (windows):
- Fix a bug that prevented Tor from starting if its log file
grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha.
src/lib/fdio/fdio.c
+3 -3
View File
@@ -48,7 +48,7 @@ off_t
tor_fd_getpos(int fd)
{
#ifdef _WIN32
return (off_t) _lseek(fd, 0, SEEK_CUR);
return (off_t) _lseeki64(fd, 0, SEEK_CUR);
#else
return (off_t) lseek(fd, 0, SEEK_CUR);
#endif
@@ -61,7 +61,7 @@ int
tor_fd_seekend(int fd)
{
#ifdef _WIN32
return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0;
return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0;
#else
off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0;
#ifdef ESPIPE
@@ -80,7 +80,7 @@ int
tor_fd_setpos(int fd, off_t pos)
{
#ifdef _WIN32
return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0;
return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0;
#else
return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0;
#endif