jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when a channel is destructed during a success-callback, the program crashed, this has been fixed by using shared_ptr

This commit is contained in:
Michael van der Werve 2014-08-19 17:43:12 +02:00
parent 07d9361d84
commit 170ef1f82a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/channelimpl.h
View File

@ -61,7 +61,7 @@ private:
* *
* @var Deferred * @var Deferred
*/ */
std::unique_ptr<Deferred> _oldestCallback = nullptr; std::shared_ptr<Deferred> _oldestCallback = nullptr;
/** /**
* Pointer to the newest deferred result (the last one to be added). * Pointer to the newest deferred result (the last one to be added).
@ -533,8 +533,12 @@ public:
// we are going to call callbacks that could destruct the channel // we are going to call callbacks that could destruct the channel
Monitor monitor(this); Monitor monitor(this);
// copy the callback (so that it will not be destructed during
// the "reportSuccess" call
auto cb = _oldestCallback;
// call the callback // call the callback
auto *next = _oldestCallback->reportSuccess(std::forward<Arguments>(parameters)...); auto *next = cb->reportSuccess(std::forward<Arguments>(parameters)...);
// leap out if channel no longer exists // leap out if channel no longer exists
if (!monitor.valid()) return false; if (!monitor.valid()) return false;
@ -565,8 +569,12 @@ public:
// call the oldest // call the oldest
if (_oldestCallback) if (_oldestCallback)
{ {
// copy the callback (so that it can not be destructed during
// the "reportError" call
auto cb = _oldestCallback;
// call the callback // call the callback
auto *next = _oldestCallback->reportError(message); auto *next = cb->reportError(message);
// leap out if channel no longer exists // leap out if channel no longer exists
if (!monitor.valid()) return; if (!monitor.valid()) return;
@ -578,8 +586,12 @@ public:
// clean up all deferred other objects // clean up all deferred other objects
while (_oldestCallback) while (_oldestCallback)
{ {
// copy the callback (so that it can not be destructed during
// the "reportError" call
auto cb = _oldestCallback;
// call the callback // call the callback
auto *next = _oldestCallback->reportError("Channel is in error state"); auto *next = cb->reportError("Channel is in error state");
// leap out if channel no longer exists // leap out if channel no longer exists
if (!monitor.valid()) return; if (!monitor.valid()) return;