kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Thu May 22 10:37:27 EDT 2008 Pekka.Pessi@nokia.com 

* msg_parser_util.c: fixed klocwork issues


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8635 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-25 15:21:02 +00:00
parent f95ffe4150
commit 9915a97a17
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Sun May 25 11:20:14 EDT 2008 Sun May 25 11:20:57 EDT 2008

25
libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c
View File

@ -191,9 +191,9 @@ issize_t msg_any_list_d(su_home_t *home,
issize_t (*scanner)(char *s), issize_t (*scanner)(char *s),
int sep) int sep)
{ {
char const *auto_list[MSG_N_PARAMS]; char const *stack[MSG_N_PARAMS];
char const **list = auto_list, **re_list; char const **list = stack, **re_list;
int N = MSG_N_PARAMS, n = 0; size_t N = MSG_N_PARAMS, n = 0;
issize_t tlen; issize_t tlen;
char *s = *ss; char *s = *ss;
char const **start; char const **start;
@ -221,7 +221,7 @@ issize_t msg_any_list_d(su_home_t *home,
if (tlen > 0) { if (tlen > 0) {
if (n + 1 == N) { /* Reallocate list? */ if (n + 1 == N) { /* Reallocate list? */
N = MSG_PARAMS_NUM(N + 1); N = MSG_PARAMS_NUM(N + 1);
if (list == auto_list || list == *append_list) { if (list == stack || list == *append_list) {
re_list = su_alloc(home, N * sizeof(*list)); re_list = su_alloc(home, N * sizeof(*list));
if (re_list) if (re_list)
memcpy(re_list, list, n * sizeof(*list)); memcpy(re_list, list, n * sizeof(*list));
@ -247,23 +247,25 @@ issize_t msg_any_list_d(su_home_t *home,
*ss = s; *ss = s;
if (n > 0 && list == auto_list) { if (n == 0) {
*append_list = NULL;
return 0;
}
if (list == stack) {
size_t size = sizeof(*list) * MSG_PARAMS_NUM(n + 1); size_t size = sizeof(*list) * MSG_PARAMS_NUM(n + 1);
list = su_alloc(home, size); list = su_alloc(home, size);
if (!list) return -1; if (!list) return -1;
memcpy((void *)list, auto_list, n * sizeof(*list)); memcpy((void *)list, stack, n * sizeof(*list));
} }
list[n] = NULL; list[n] = NULL;
if (n == 0)
list = NULL;
*append_list = list; *append_list = list;
return 0; return 0;
error: error:
*start = NULL; *start = NULL;
if (list != auto_list && list != *append_list) if (list != stack && list != *append_list)
su_free(home, list); su_free(home, list);
return -1; return -1;
} }
@ -362,7 +364,8 @@ issize_t msg_avlist_d(su_home_t *home,
for (n = 0; params[n]; n++) for (n = 0; params[n]; n++)
; ;
N = MSG_PARAMS_NUM(n + 1); N = MSG_PARAMS_NUM(n + 1);
} else { }
else {
params = stack; params = stack;
N = MSG_PARAMS_NUM(1); N = MSG_PARAMS_NUM(1);
} }