Selaa lähdekoodia

rls: proper handling of return code for parse from/to uri

Daniel-Constantin Mierla 8 vuotta sitten
vanhempi
commit
bb536c3dae
2 muutettua tiedostoa jossa 3 lisäystä ja 4 poistoa
  1. 1 2
      src/modules/rls/rls.c
  2. 2 2
      src/modules/rls/subscribe.c

+ 1 - 2
src/modules/rls/rls.c

@@ -1023,8 +1023,7 @@ int rls_restore_db_subs(void)
 	return 0;
 	return 0;
 
 
 error:
 error:
-	if(res)
-		rls_dbf.free_result(rls_db, res);
+	rls_dbf.free_result(rls_db, res);
 	return -1;
 	return -1;
 
 
 }
 }

+ 2 - 2
src/modules/rls/subscribe.c

@@ -440,7 +440,7 @@ int rls_handle_subscribe0(struct sip_msg* msg)
 {
 {
 	struct to_body *pfrom;
 	struct to_body *pfrom;
 
 
-	if (parse_from_uri(msg) < 0)
+	if (parse_from_uri(msg) == NULL)
 	{
 	{
 		LM_ERR("failed to find From header\n");
 		LM_ERR("failed to find From header\n");
 		if (slb.freply(msg, 400, &pu_400_rpl) < 0)
 		if (slb.freply(msg, 400, &pu_400_rpl) < 0)
@@ -507,7 +507,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma
 		return 0;
 		return 0;
 	}
 	}
 	/* check for To and From headesr */
 	/* check for To and From headesr */
-	if(parse_to_uri(msg)<0 || parse_from_uri(msg)<0)
+	if(parse_to_uri(msg)==NULL || parse_from_uri(msg)==NULL)
 	{
 	{
 		LM_ERR("failed to find To or From headers\n");
 		LM_ERR("failed to find To or From headers\n");
 		if (slb.freply(msg, 400, &pu_400_rpl) < 0)
 		if (slb.freply(msg, 400, &pu_400_rpl) < 0)