Differences From Artifact [749b5fd798]:
- File src/OFStream.m — part of check-in [c7f0229795] at 2020-01-02 01:51:34 on branch trunk — Update copyright (user: js, size: 40752) [annotate] [blame] [check-ins using] [more...]
To Artifact [2c231bfb94]:
- File
src/OFStream.m
— part of check-in
[321fa12f9a]
at
2020-01-07 20:36:33
on branch trunk
— OFStream: Always cancel async requests on close
This avoids accidentally trying to remove a closed file descriptor from
a kernel event observer. (user: js, size: 40812) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 |
[self freeMemory: _readBufferMemory];
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength += length;
}
- (void)close
{
[self freeMemory: _readBufferMemory];
_readBuffer = _readBufferMemory = NULL;
_readBufferLength = 0;
[self freeMemory: _writeBuffer];
_writeBuffer = NULL;
_writeBufferLength = 0;
_writeBuffered = false;
_waitingForDelimiter = false;
}
@end
| > > > > | 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 |
[self freeMemory: _readBufferMemory];
_readBuffer = _readBufferMemory = readBuffer;
_readBufferLength += length;
}
- (void)close
{
#ifdef OF_HAVE_SOCKETS
[self cancelAsyncRequests];
#endif
[self freeMemory: _readBufferMemory];
_readBuffer = _readBufferMemory = NULL;
_readBufferLength = 0;
[self freeMemory: _writeBuffer];
_writeBuffer = NULL;
_writeBufferLength = 0;
_writeBuffered = false;
_waitingForDelimiter = false;
}
@end
|