summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-05-24 16:48:53 +0000
committerGordon Sim <gsim@apache.org>2013-05-24 16:48:53 +0000
commit9e029e41db347afe3e13f5873b339d5c74248d1b (patch)
treeb95cdb6690be251c5d94f653bd1abcf2a6490a5b
parent14bdf31f341ed654918d6a68eaafa25684d4df99 (diff)
downloadqpid-python-9e029e41db347afe3e13f5873b339d5c74248d1b.tar.gz
QPID-4884: prevent segfault when translating x-declare into 1.0 node properties
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1486113 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/src/qpid/messaging/amqp/AddressHelper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
index bcdce59389..66d9bc81da 100644
--- a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+++ b/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
@@ -164,8 +164,8 @@ void flatten(Variant::Map& base, const std::string& nested)
Variant::Map::iterator i = base.find(nested);
if (i != base.end()) {
add(base, i->second.asMap());
+ base.erase(i);
}
- base.erase(i);
}
}