RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 20:25:07 +00:00
Code Issues Activity Actions

IPCCompiler: Properly handle stream read errors

Browse source 
If we exhaust the buffer stream, the reads appear to succeed, but the stream
itself panics when we later attempt to drop it. To prevent it, we check for
errors explicitly.
This commit is contained in:
Sergey Bugaev 2020-06-08 14:10:53 +03:00 • committed by Andreas Kling
parent fc481552f5
commit bb19eb8f23
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
DevTools/IPCCompiler/main.cpp
View file

@ -393,19 +393,33 @@ int main(int argc, char** argv)
out() << " BufferStream stream(const_cast<ByteBuffer&>(buffer));"; out() << " BufferStream stream(const_cast<ByteBuffer&>(buffer));";
out() << " i32 message_endpoint_magic = 0;"; out() << " i32 message_endpoint_magic = 0;";
out() << " stream >> message_endpoint_magic;"; out() << " stream >> message_endpoint_magic;";
out() << " if (stream.handle_read_failure()) {";
#ifdef GENERATE_DEBUG_CODE
out() << " dbg() << \"Failed to read message endpoint magic\";";
#endif
out() << " return nullptr;";
out() << " }";
out() << " if (message_endpoint_magic != " << endpoint.magic << ") {"; out() << " if (message_endpoint_magic != " << endpoint.magic << ") {";
#ifdef GENERATE_DEBUG_CODE #ifdef GENERATE_DEBUG_CODE
sout() << " sout() << \"endpoint magic \" << message_endpoint_magic << \" != " << endpoint.magic << "\";"; out() << " dbg() << \"endpoint magic \" << message_endpoint_magic << \" != " << endpoint.magic << "\";";
#endif #endif
out() << " return nullptr;"; out() << " return nullptr;";
out() << " }"; out() << " }";
out() << " i32 message_id = 0;"; out() << " i32 message_id = 0;";
out() << " stream >> message_id;"; out() << " stream >> message_id;";
out() << " if (stream.handle_read_failure()) {";
#ifdef GENERATE_DEBUG_CODE
out() << " dbg() << \"Failed to read message ID\";";
#endif
out() << " return nullptr;";
out() << " }";
out() << " OwnPtr<IPC::Message> message;";
out() << " switch (message_id) {"; out() << " switch (message_id) {";
for (auto& message : endpoint.messages) { for (auto& message : endpoint.messages) {
auto do_decode_message = [&](const String& name) { auto do_decode_message = [&](const String& name) {
out() << " case (int)Messages::" << endpoint.name << "::MessageID::" << name << ":"; out() << " case (int)Messages::" << endpoint.name << "::MessageID::" << name << ":";
out() << " return Messages::" << endpoint.name << "::" << name << "::decode(stream, size_in_bytes);"; out() << " message = Messages::" << endpoint.name << "::" << name << "::decode(stream, size_in_bytes);";
out() << " break;";
}; };
do_decode_message(message.name); do_decode_message(message.name);
if (message.is_synchronous) if (message.is_synchronous)
@ -413,11 +427,18 @@ int main(int argc, char** argv)
} }
out() << " default:"; out() << " default:";
#ifdef GENERATE_DEBUG_CODE #ifdef GENERATE_DEBUG_CODE
sout() << " sout() << \"Failed to decode " << endpoint.name << ".(\" << message_id << \")\";"; out() << " dbg() << \"Failed to decode " << endpoint.name << ".(\" << message_id << \")\";";
#endif #endif
out() << " return nullptr;"; out() << " return nullptr;";
out() << " }"; out() << " }";
out() << " if (stream.handle_read_failure()) {";
#ifdef GENERATE_DEBUG_CODE
out() << " sout() << \"Failed to read the message\";";
#endif
out() << " return nullptr;";
out() << " }";
out() << " return message;";
out() << " }"; out() << " }";
out(); out();
out() << " virtual OwnPtr<IPC::Message> handle(const IPC::Message& message) override"; out() << " virtual OwnPtr<IPC::Message> handle(const IPC::Message& message) override";