@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -40,12 +40,14 @@
 #import "OFTimer.h"
 #import "OFTimer+Private.h"
 #import "OFDate.h"
 
 #import "OFObserveFailedException.h"
+#import "OFWriteFailedException.h"
 
-const OFRunLoopMode OFDefaultRunLoopMode = @"OFDefaultRunLoopMode";
+#include "OFRunLoopConstants.inc"
+
 static OFRunLoop *mainRunLoop = nil;
 
 @interface OFRunLoopState: OFObject
 #ifdef OF_HAVE_SOCKETS
     <OFKernelEventObserverDelegate>
@@ -566,26 +568,31 @@
 	size_t dataLength = _data.count * _data.itemSize;
 	OFData *newData, *oldData;
 
 	@try {
 		const char *dataItems = _data.items;
+		length = dataLength - _writtenLength;
+		[object writeBuffer: dataItems + _writtenLength length: length];
+	} @catch (OFWriteFailedException *e) {
+		length = e.bytesWritten;
 
-		length = [object writeBuffer: dataItems + _writtenLength
-				      length: dataLength - _writtenLength];
+		if (e.errNo != EWOULDBLOCK && e.errNo != EAGAIN)
+			exception = e;
 	} @catch (id e) {
 		length = 0;
 		exception = e;
 	}
 
 	_writtenLength += length;
+	OFEnsure(_writtenLength <= dataLength);
 
 	if (_writtenLength != dataLength && exception == nil)
 		return true;
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newData = _block(_data, _writtenLength, exception);
+		newData = _block(_writtenLength, exception);
 
 		if (newData == nil)
 			return false;
 
 		oldData = _data;
@@ -638,26 +645,31 @@
 	size_t cStringLength = [_string cStringLengthWithEncoding: _encoding];
 	OFString *newString, *oldString;
 
 	@try {
 		const char *cString = [_string cStringWithEncoding: _encoding];
+		length = cStringLength - _writtenLength;
+		[object writeBuffer: cString + _writtenLength length: length];
+	} @catch (OFWriteFailedException *e) {
+		length = e.bytesWritten;
 
-		length = [object writeBuffer: cString + _writtenLength
-				      length: cStringLength - _writtenLength];
+		if (e.errNo != EWOULDBLOCK && e.errNo != EAGAIN)
+			exception = e;
 	} @catch (id e) {
 		length = 0;
 		exception = e;
 	}
 
 	_writtenLength += length;
+	OFEnsure(_writtenLength <= cStringLength);
 
 	if (_writtenLength != cStringLength && exception == nil)
 		return true;
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newString = _block(_string, _writtenLength, exception);
+		newString = _block(_writtenLength, exception);
 
 		if (newString == nil)
 			return false;
 
 		oldString = _string;
@@ -847,11 +859,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newData = _block(_data, &_receiver, exception);
+		newData = _block(exception);
 
 		if (newData == nil)
 			return false;
 
 		oldData = _data;
@@ -948,11 +960,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newData = _block(_data, exception);
+		newData = _block(exception);
 
 		if (newData == nil)
 			return false;
 
 		oldData = _data;
@@ -1413,12 +1425,14 @@
 
 - (void)of_removeTimer: (OFTimer *)timer forMode: (OFRunLoopMode)mode
 {
 	OFRunLoopState *state = stateForMode(self, mode, false);
 
-	if (state == nil)
+	/* {} required to avoid -Wmisleading-indentation false positive. */
+	if (state == nil) {
 		return;
+	}
 
 #ifdef OF_HAVE_THREADS
 	[state->_timersQueueMutex lock];
 	@try {
 #endif