diff options
| author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2017-04-24 17:14:32 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2017-05-02 06:25:51 -0700 |
| commit | 375dc7b81795da9bfd8372f629d7fcef704a6d58 (patch) | |
| tree | c16cae788798d7924ba74ca036c72ed3531fd208 /AudioManagerUtilities/include/CAmSocketHandler.h | |
| parent | a737433a4362e8244801491857d28502adf4c76c (diff) | |
| download | audiomanager-375dc7b81795da9bfd8372f629d7fcef704a6d58.tar.gz | |
Fix for bug in CAmSocketHandler causing invalid pointers and crash.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Change-Id: I8d3d2b436ac9fcd61c73a28145a731f327cab1e2
Diffstat (limited to 'AudioManagerUtilities/include/CAmSocketHandler.h')
| -rw-r--r-- | AudioManagerUtilities/include/CAmSocketHandler.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h index c2a1aa3..0f9b710 100644 --- a/AudioManagerUtilities/include/CAmSocketHandler.h +++ b/AudioManagerUtilities/include/CAmSocketHandler.h @@ -321,7 +321,6 @@ namespace am int mPipe[2]; int mDispatchDone; //this starts / stops the mainloop - VectorListPollfd_t mfdPollingArray; //!<the polling array for ppoll sh_identifier_s mSetPollKeys; //!A set of all used ppoll keys VectorListPoll_t mListPoll; //!<list that holds all information for the ppoll sh_identifier_s mSetTimerKeys; //!A set of all used timer keys @@ -435,14 +434,14 @@ namespace am * @param a * @return */ - inline static void prepare(am::CAmSocketHandler::sh_poll_s& row); - + inline static void prepare(sh_poll_s& row); + /** * functor to return all fired events * @param a * @return */ - inline static void fire(sh_poll_s* a); + inline static void fire(sh_poll_s& a); /** * functor to return all fired events @@ -456,14 +455,14 @@ namespace am * @param a * @return */ - inline static bool noDispatching(const sh_poll_s* a); + inline static bool noDispatching(const sh_poll_s& a); /** * checks if dispatching is already finished * @param a * @return */ - inline static bool dispatchingFinished(const sh_poll_s* a); + inline static bool dispatchingFinished(const sh_poll_s& a); /** * timer fire callback |