From bac9ff62efb02e8b0560a76bd2293100fe0a4341 Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Fri, 11 Nov 2011 21:33:54 +0000 Subject: Fix bad quoting of multiline mxml opaque_data that caused invalid xml. The opaque_data was added and enclosed in single quotes, assuming it would be only a single line. The rest of the lines were appended after the closing quote. (closes issue ASTERISK-18852) Reported by: peep_ on IRC Review: https://reviewboard.asterisk.org/r/1577 ........ Merged revisions 344835 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 344836 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344838 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main/manager.c b/main/manager.c index d07ceb83a..fd045e833 100644 --- a/main/manager.c +++ b/main/manager.c @@ -5755,9 +5755,10 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *g } if (in_data) { - /* Process data field in Opaque mode */ - xml_copy_escape(out, val, 0); /* data field */ + /* Process data field in Opaque mode. This is a + * followup, so we re-add line feeds. */ ast_str_append(out, 0, xml ? "\n" : "
\n"); + xml_copy_escape(out, val, 0); /* data field */ continue; } @@ -5793,7 +5794,9 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *g ao2_ref(vc, -1); ast_str_append(out, 0, xml ? "='" : ""); xml_copy_escape(out, val, 0); /* data field */ - ast_str_append(out, 0, xml ? "'" : "\n"); + if (!in_data || !*in) { + ast_str_append(out, 0, xml ? "'" : "\n"); + } } if (inobj) { -- cgit v1.2.3