ObjFW  Check-in [46ebdddf8f]

Overview
Comment:OFStdIOStream_Win32Console: Fix wrong return
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 46ebdddf8fdeded044eae92bcb59ad40ea6031a08c910a4bb9723f21991c9123
User & Date: js on 2017-10-05 21:19:42
Other Links: manifest | tags
Context
2017-10-07
08:21
ofzip: Do not skip over directory type tar entries check-in: 57551c2e32 user: js tags: trunk
2017-10-05
21:19
OFStdIOStream_Win32Console: Fix wrong return check-in: 46ebdddf8f user: js tags: trunk
20:10
call-x86_64-elf.S: Reorder to save one mem access check-in: cb30e471ca user: js tags: trunk
Changes

Modified src/OFStdIOStream_Win32Console.m from [9bf00d9f6c] to [ddf6ede371].

245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
			toCopy = length;

		memcpy(_incompleteUTF8Surrogate + _incompleteUTF8SurrogateLen,
		    buffer, toCopy);
		_incompleteUTF8SurrogateLen += toCopy;

		if (_incompleteUTF8SurrogateLen < (size_t)UTF8Len)
			return;

		UTF8Len = of_string_utf8_decode(
		    _incompleteUTF8Surrogate, _incompleteUTF8SurrogateLen, &c);

		if (UTF8Len <= 0 || c > 0x10FFFF) {
			assert(UTF8Len == 0 || UTF8Len < -4);








|







245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
			toCopy = length;

		memcpy(_incompleteUTF8Surrogate + _incompleteUTF8SurrogateLen,
		    buffer, toCopy);
		_incompleteUTF8SurrogateLen += toCopy;

		if (_incompleteUTF8SurrogateLen < (size_t)UTF8Len)
			return 0;

		UTF8Len = of_string_utf8_decode(
		    _incompleteUTF8Surrogate, _incompleteUTF8SurrogateLen, &c);

		if (UTF8Len <= 0 || c > 0x10FFFF) {
			assert(UTF8Len == 0 || UTF8Len < -4);