qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1486113 - /qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
Date Fri, 24 May 2013 16:48:53 GMT
Author: gsim
Date: Fri May 24 16:48:53 2013
New Revision: 1486113

URL: http://svn.apache.org/r1486113
Log:
QPID-4884: prevent segfault when translating x-declare into 1.0 node properties

Modified:
    qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp?rev=1486113&r1=1486112&r2=1486113&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp Fri May 24 16:48:53 2013
@@ -164,8 +164,8 @@ void flatten(Variant::Map& base, const s
     Variant::Map::iterator i = base.find(nested);
     if (i != base.end()) {
         add(base, i->second.asMap());
+        base.erase(i);
     }
-    base.erase(i);
 }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message