svn commit: r1547427 - /subversion/trunk/subversion/mod_dav_svn/lock.c

[ph...@apache.org]

Author: philip
Date: Tue Dec  3 15:15:36 2013
New Revision: 1547427

URL: http://svn.apache.org/r1547427
Log:
* subversion/mod_dav_svn/lock.c
  (format_locktoken): XML escape the token from the FS.

Modified:
    subversion/trunk/subversion/mod_dav_svn/lock.c

Modified: subversion/trunk/subversion/mod_dav_svn/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/lock.c?rev=1547427&r1=1547426&r2=1547427&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/lock.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/lock.c Tue Dec  3 15:15:36 2013
@@ -274,8 +274,13 @@ parse_locktoken(apr_pool_t *pool,
 static const char *
 format_locktoken(apr_pool_t *p, const dav_locktoken *locktoken)
 {
-  /* libsvn_fs already produces a valid locktoken URI. */
-  return apr_pstrdup(p, locktoken->uuid_str);
+  svn_stringbuf_t *formatted
+    = svn_stringbuf_create_ensure(strlen(locktoken->uuid_str), p);
+
+  /* libsvn_fs produces a locktoken URI that will be valid XML when
+     escaped. */
+  svn_xml_escape_cdata_cstring(&formatted, locktoken->uuid_str, p);
+  return formatted->data;
 }