[asterisk-commits] mmichelson: branch 12 r397960 - /branches/12/res/res_pjsip_pidf.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Aug 29 17:53:17 2013
New Revision: 397960

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397960
Log:
Fix method for creating activities string in PIDF bodies.

The previous method did not allocate enough space to create
the entire string, but adjusted the string's slen value to
be larger than the actual allocation. This resulted in garbled
text in NOTIFY requests from Asterisk.

This method allocates the proper amount of space first and then
writes the content into the buffer.


Modified:
    branches/12/res/res_pjsip_pidf.c

Modified: branches/12/res/res_pjsip_pidf.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_pidf.c?view=diff&rev=397960&r1=397959&r2=397960
==============================================================================
--- branches/12/res/res_pjsip_pidf.c (original)
+++ branches/12/res/res_pjsip_pidf.c Thu Aug 29 17:53:17 2013
@@ -159,8 +159,11 @@
 
 	if (pidfstate[0] != '-') {
 		pj_xml_node *activities = create_node(pool, status, "ep:activities");
-		pj_strdup2(pool, &activities->content, "ep:");
-		pj_strcat2(&activities->content, pidfstate);
+		size_t str_size = sizeof("ep:") + strlen(pidfstate);
+
+		activities->content.ptr = pj_pool_alloc(pool, str_size);
+		activities->content.slen = pj_ansi_snprintf(activities->content.ptr, str_size,
+				"ep:%s", pidfstate);
 	}
 
 	create_attr(pool, node, XMLNS_PP, XMLNS_PERSON);