kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix string growth algorithm for XML presence bodies.

Browse Source 
pjpidf_print() does not return < 0 if there is not enough
room for the document to be printed. Rather, it returns
39, the length of the XML prolog.

The algorithm also had a bug in that it would return if
it attempted to grow the string larger.
........

Merged revisions 416442 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-06-17 16:35:04 +00:00
parent 163c734ae7
commit 351db2033c
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_pjsip_pidf_body_generator.c
View File

@@ -80,6 +80,7 @@ static int pidf_generate_body_content(void *body, void *data)
} }
#define MAX_STRING_GROWTHS 3 #define MAX_STRING_GROWTHS 3
#define XML_PROLOG 39
static void pidf_to_string(void *body, struct ast_str **str) static void pidf_to_string(void *body, struct ast_str **str)
{ {
@@ -89,14 +90,13 @@ static void pidf_to_string(void *body, struct ast_str **str)
do { do {
size = pjpidf_print(pres, ast_str_buffer(*str), ast_str_size(*str) - 1); size = pjpidf_print(pres, ast_str_buffer(*str), ast_str_size(*str) - 1);
if (size < 0) { if (size == XML_PROLOG) {
ast_str_make_space(str, ast_str_size(*str) * 2); ast_str_make_space(str, ast_str_size(*str) * 2);
++growths; ++growths;
return;
} }
} while (size < 0 && growths < MAX_STRING_GROWTHS); } while (size == XML_PROLOG && growths < MAX_STRING_GROWTHS);
if (size < 0) { if (size == XML_PROLOG) {
ast_log(LOG_WARNING, "PIDF body text too large\n"); ast_log(LOG_WARNING, "PIDF body text too large\n");
return; return;
} }

9
res/res_pjsip_xpidf_body_generator.c
View File

@@ -97,6 +97,7 @@ static int xpidf_generate_body_content(void *body, void *data)
} }
#define MAX_STRING_GROWTHS 3 #define MAX_STRING_GROWTHS 3
#define XML_PROLOG 39
static void xpidf_to_string(void *body, struct ast_str **str) static void xpidf_to_string(void *body, struct ast_str **str)
{ {
@@ -105,16 +106,14 @@ static void xpidf_to_string(void *body, struct ast_str **str)
int size; int size;
do { do {
size = pjxpidf_print(pres, ast_str_buffer(*str), ast_str_size(*str)); size = pjxpidf_print(pres, ast_str_buffer(*str), ast_str_size(*str));
if (size < 0) { if (size == XML_PROLOG) {
ast_str_make_space(str, ast_str_size(*str) * 2); ast_str_make_space(str, ast_str_size(*str) * 2);
++growths; ++growths;
return;
} }
} while (size < 0 && growths < MAX_STRING_GROWTHS); } while (size == XML_PROLOG && growths < MAX_STRING_GROWTHS);
if (size < 0) { if (size == XML_PROLOG) {
ast_log(LOG_WARNING, "XPIDF body text too large\n"); ast_log(LOG_WARNING, "XPIDF body text too large\n");
return; return;
} }