RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:38:12 +00:00
Code Issues Activity Actions

AK: Make writability violation of FixedMemoryStream non-fatal

Browse source 
Writing to a read-only file is not a program-crashing error either, so
we just return the standard EBADFD (see write(2)) here.
This commit is contained in:
kleines Filmröllchen 2023-09-19 12:02:05 +02:00 • committed by Tim Schumacher
parent bbeabe929b
commit 5b2496e522
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
AK/MemoryStream.cpp
View file

@ -93,7 +93,11 @@ ErrorOr<size_t> FixedMemoryStream::seek(i64 offset, SeekMode seek_mode)
ErrorOr<size_t> FixedMemoryStream::write_some(ReadonlyBytes bytes) ErrorOr<size_t> FixedMemoryStream::write_some(ReadonlyBytes bytes)
{ {
VERIFY(m_writing_enabled); // MemoryStream isn't based on file-descriptors, but since most other
// Stream implementations are, the interface specifies EBADF as the
// "we don't support this particular operation" error code.
if (!m_writing_enabled)
return Error::from_errno(EBADF);
// FIXME: Can this not error? // FIXME: Can this not error?
auto const nwritten = bytes.copy_trimmed_to(m_bytes.slice(m_offset)); auto const nwritten = bytes.copy_trimmed_to(m_bytes.slice(m_offset));

6
Tests/AK/TestMemoryStream.cpp
View file

@ -190,11 +190,7 @@ TEST_CASE(fixed_memory_read_only)
TRY_OR_FAIL(stream.seek(0)); TRY_OR_FAIL(stream.seek(0));
ReadonlyBytes buffer { some_words.characters_without_null_termination(), some_words.length() }; ReadonlyBytes buffer { some_words.characters_without_null_termination(), some_words.length() };
EXPECT_CRASH("Write protection assert", [&] { EXPECT(stream.write_some(buffer).is_error());
(void)stream.write_some(buffer);
return Test::Crash::Failure::DidNotCrash;
});
EXPECT_EQ(TRY_OR_FAIL(stream.tell()), 0ull); EXPECT_EQ(TRY_OR_FAIL(stream.tell()), 0ull);
EXPECT(!stream.is_eof()); EXPECT(!stream.is_eof());
} }