summaryrefslogtreecommitdiff
path: root/qpid/cpp
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
commit956c316470d1f8e884b127f251043ebe16893e96 (patch)
tree04ad30c02ee4eeb9661f8f9d9ce3fdf71ba4b5bf /qpid/cpp
parent0592eb51e42839bb60f611419c3adcf4a4383f46 (diff)
downloadqpid-python-956c316470d1f8e884b127f251043ebe16893e96.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@1486113 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
index bcdce59389..66d9bc81da 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+++ b/qpid/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);
}
}