[Freeswitch-svn] [commit] r13336 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
FreeSWITCH SVN
mikej at freeswitch.org
Fri May 15 09:05:15 PDT 2009
Author: mikej
Date: Fri May 15 11:05:15 2009
New Revision: 13336
Log:
Wed May 13 10:50:41 CDT 2009 Pekka Pessi <first.last at nokia.com>
* msg: fixed possible leak in msg_params_d() with more than 16 params
Ignore-this: a45ef326def7b1bcd14de4850f3c24ab
Coverity issue.
Modified:
freeswitch/trunk/libs/sofia-sip/.update
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c
Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update (original)
+++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:05:15 2009
@@ -1 +1 @@
-Fri May 15 11:04:08 CDT 2009
+Fri May 15 11:04:52 CDT 2009
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c Fri May 15 11:05:15 2009
@@ -415,12 +415,14 @@
if (n == N) {
/* Reallocate params */
- char **nparams = su_alloc(home,
- (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params));
+ char const **nparams = su_realloc(home, params != stack ? params : NULL,
+ (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params));
if (!nparams) {
goto error;
}
- params = memcpy(nparams, params, n * sizeof(*params));
+ if (params == stack)
+ memcpy(nparams, stack, n * sizeof(*params));
+ params = nparams;
}
params[n++] = p;
@@ -441,12 +443,14 @@
}
else if (n == N) {
/* Reallocate params */
- char **nparams = su_alloc(home,
- (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params));
+ char const **nparams = su_realloc(home, params != stack ? params : NULL,
+ (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params));
if (!nparams) {
goto error;
}
- params = memcpy(nparams, params, n * sizeof(*params));
+ if (params == stack)
+ memcpy(nparams, stack, n * sizeof(*params));
+ params = nparams;
}
params[n] = NULL;
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c Fri May 15 11:05:15 2009
@@ -285,6 +285,24 @@
su_free(home, (void *)p), p = NULL;
}
+ master = ";0";
+
+ for (i = 1; i < 256; i++) {
+ master = su_sprintf(home, "%s; %u", master, i); TEST_1(master);
+ list = end = su_strdup(home, master);
+ TEST_1(msg_params_d(NULL, &end, &p) >= 0);
+ TEST_S(end, "");
+ TEST_1(p);
+ for (j = 0; j <= i; j++) {
+ char number[10];
+ snprintf(number, sizeof number, "%u", j);
+ TEST_S(p[j], number);
+ }
+ TEST_1(p[i + 1] == NULL);
+ su_free(home, list);
+ su_free(NULL, (void *)p), p = NULL;
+ }
+
su_home_deinit(home);
}
@@ -722,6 +740,8 @@
TEST(msg_serialize(msg, (msg_pub_t *)tst), 0);
}
+ msg_destroy(msg);
+
/* Bug #2429 */
orig = read_msg("GET a-life HTTP/1.1" CRLF
"Foo: bar" CRLF
@@ -734,6 +754,7 @@
TEST_1(otst);
msg = msg_copy(orig);
+ msg_destroy(orig);
tst = msg_test_public(msg);
TEST_1(tst);
More information about the Freeswitch-svn
mailing list