[sr-dev] git:4.1: xhttp_pi: fix escaping

Module: sip-router Branch: 4.1 Commit: 714413bf8f11bca5ff4966fcef12d5a03ae64ca2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=714413b… Author: Ovidiu Sas &lt;osas(a)voipembedded.com&gt; Committer: Ovidiu Sas &lt;osas(a)voipembedded.com&gt; Date: Tue Apr 1 18:34:28 2014 -0400 xhttp_pi: fix escaping (cherry picked from commit dd004947906628784ffdf15a0fe5cf4421040ddc) --- modules/xhttp_pi/xhttp_pi_fnc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/modules/xhttp_pi/xhttp_pi_fnc.c index 71f6fbc..5602429 100644 --- a/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/modules/xhttp_pi/xhttp_pi_fnc.c @@ -252,31 +252,31 @@ do{ \ case '<': \ (temp_holder).len = (temp_counter) - (temp_holder).len; \ XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_LT); \ - (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).s = (str).s + (temp_counter) + 1; \ (temp_holder).len = (temp_counter) + 1; \ break; \ case '>': \ (temp_holder).len = (temp_counter) - (temp_holder).len; \ XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_GT); \ - (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).s = (str).s + (temp_counter) + 1; \ (temp_holder).len = (temp_counter) + 1; \ break; \ case '&': \ (temp_holder).len = (temp_counter) - (temp_holder).len; \ XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_AMP); \ - (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).s = (str).s + (temp_counter) + 1; \ (temp_holder).len = (temp_counter) + 1; \ break; \ case '"': \ (temp_holder).len = (temp_counter) - (temp_holder).len; \ XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_QUOT); \ - (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).s = (str).s + (temp_counter) + 1; \ (temp_holder).len = (temp_counter) + 1; \ break; \ case '\'': \ (temp_holder).len = (temp_counter) - (temp_holder).len; \ XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_SQUOT); \ - (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).s = (str).s + (temp_counter) + 1; \ (temp_holder).len = (temp_counter) + 1; \ break; \ } \ @@ -385,7 +385,7 @@ static const str XHTTP_PI_Response_Foot = str_init(\ "\n</center>\n<div align=\"center\" class=\"foot\" style=\"margin:20px auto\">"\ "<span style='margin-left:5px;'></span>"\ "<a href=\"http://kamailio.org\">Kamailio web site</a><br/>"\ - "Copyright &copy; 2012-2013 <a href=\"http://www.voipembedded.com/\">VoIP Embedded Inc.</a>"\ + "Copyright &copy; 2012-2014 <a href=\"http://www.voipembedded.com/\">VoIP Embedded Inc.</a>"\ ". All rights reserved."\ "</div></body></html>");