aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-10 15:53:39 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-10 15:53:39 +0000
commit943bc6c478315e658149ced7f4d94f8ff76149dc (patch)
tree00125b33e91c1133660891934117570e2f6d5462
parent91fca7cf799ab7f2edacfcf188596bcc9dda3207 (diff)
Patch for AST-2009-002-1.4
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.4.23.2@180834 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--.version2
-rw-r--r--channels/chan_sip.c39
2 files changed, 33 insertions, 8 deletions
diff --git a/.version b/.version
index dfd7ca950..598f315a2 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.4.23.1
+1.4.23.2
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 004aaaabe..b3863c573 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13917,19 +13917,32 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
*/
static int sip_uri_params_cmp(const char *input1, const char *input2)
{
- char *params1 = ast_strdupa(input1);
- char *params2 = ast_strdupa(input2);
+ char *params1 = NULL;
+ char *params2 = NULL;
char *pos1;
char *pos2;
+ int zerolength1 = 0;
+ int zerolength2 = 0;
int maddrmatch = 0;
int ttlmatch = 0;
int usermatch = 0;
int methodmatch = 0;
+ if (ast_strlen_zero(input1)) {
+ zerolength1 = 1;
+ } else {
+ params1 = ast_strdupa(input1);
+ }
+ if (ast_strlen_zero(input2)) {
+ zerolength2 = 1;
+ } else {
+ params2 = ast_strdupa(input2);
+ }
+
/*Quick optimization. If both params are zero-length, then
* they match
*/
- if (ast_strlen_zero(params1) && ast_strlen_zero(params2)) {
+ if (zerolength1 && zerolength2) {
return 0;
}
@@ -14044,13 +14057,25 @@ fail:
*/
static int sip_uri_headers_cmp(const char *input1, const char *input2)
{
- char *headers1 = ast_strdupa(input1);
- char *headers2 = ast_strdupa(input2);
- int zerolength1 = ast_strlen_zero(headers1);
- int zerolength2 = ast_strlen_zero(headers2);
+ char *headers1 = NULL;
+ char *headers2 = NULL;
+ int zerolength1 = 0;
+ int zerolength2 = 0;
int different = 0;
char *header1;
+ if (ast_strlen_zero(input1)) {
+ zerolength1 = 1;
+ } else {
+ headers1 = ast_strdupa(input1);
+ }
+
+ if (ast_strlen_zero(input2)) {
+ zerolength2 = 1;
+ } else {
+ headers2 = ast_strdupa(input2);
+ }
+
if ((zerolength1 && !zerolength2) ||
(zerolength2 && !zerolength1))
return 1;