Author: brane
Date: Thu Nov 21 07:59:04 2013
New Revision: 1544059

URL: http://svn.apache.org/r1544059
Log:
* 
subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
  (KeywordHashBuilder::operator()): Copy the key into the same pool as the 
value,
   to make sure their lifetimes are the same.

Modified:
    
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp

Modified: 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp?rev=1544059&r1=1544058&r2=1544059&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
 Thu Nov 21 07:59:04 2013
@@ -91,8 +91,10 @@ public:
 
   void operator()(const std::string& key, const Java::ByteArray& value)
     {
+      const char* const safe_key =
+        apr_pstrmemdup(m_pool.getPool(), key.c_str(), key.size() + 1);
       Java::ByteArray::Contents val(value);
-      apr_hash_set(m_hash, key.c_str(), key.size(), val.get_string(m_pool));
+      apr_hash_set(m_hash, safe_key, key.size(), val.get_string(m_pool));
     }
 
   apr_hash_t* get() const


Reply via email to