Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08a3fd6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "libbinder_ndk: validate the interface before using"

parents fbb09e36 45089afd

libs/binder/ndk/include_cpp/android/binder_interface_utils.h

+8 −2
Original line number Diff line number Diff line
@@ -291,16 +291,22 @@ void ICInterface::ICInterfaceData::onDestroy(void* userData) { 
binder_status_t ICInterface::ICInterfaceData::onDump(AIBinder* binder, int fd, const char** args,

                                                     uint32_t numArgs) {

    std::shared_ptr<ICInterface> interface = getInterface(binder);

    if (interface != nullptr) {

        return interface->dump(fd, args, numArgs);

    }

    return STATUS_DEAD_OBJECT;

}



#ifdef HAS_BINDER_SHELL_COMMAND

binder_status_t ICInterface::ICInterfaceData::handleShellCommand(AIBinder* binder, int in, int out,

                                                                 int err, const char** argv,

                                                                 uint32_t argc) {

    std::shared_ptr<ICInterface> interface = getInterface(binder);

    if (interface != nullptr) {

        return interface->handleShellCommand(in, out, err, argv, argc);

    }

    return STATUS_DEAD_OBJECT;

}

#endif



template <typename INTERFACE>