@@ -693,7 +693,7 @@ int do_action(struct action* a, struct sip_msg* msg)

 			} else if (a->p2_type == ACTION_ST) {

 				flags = a->p1.attr->type;

 				name = a->p1.attr->name;

-				if (&a->p2.data) {

+				if (a->p2.data) {

 					value.n = run_actions((struct action*)a->p2.data, msg);

 				} else {

 					value.n = -1;

@@ -682,7 +682,7 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch )

 {

 	struct cell*  p_cell;

 	unsigned int hash_index   = 0;

-	int entry_label  = 0;

+	unsigned int entry_label  = 0;

 	unsigned int branch_id    = 0;

 	char  *hashi, *branchi, *p, *n;

 	int hashl, branchl;

@@ -376,6 +376,9 @@ inline static int comp_str(int op, str* left, int rtype, union exp_op* r)

 	avp_t* avp;

 	int ret;

 	char backup;

+	regex_t* re;

+	

+	right=0; /* warning fix */

 	if (rtype == AVP_ST) {

 		avp = search_first_avp(r->attr->type, r->attr->name, &val, 0);

@@ -419,19 +422,21 @@ inline static int comp_str(int op, str* left, int rtype, union exp_op* r)

 			backup=left->s[left->len];

 			left->s[left->len]='\0';

 			if (rtype == AVP_ST) {

-				regex_t* re;

 				     /* For AVPs we need to compile the RE on the fly */

 				re=(regex_t*)pkg_malloc(sizeof(regex_t));

 				if (re==0){

 					LOG(L_CRIT, "ERROR: comp_strstr: memory allocation"

 					    " failure\n");

+					left->s[left->len] = backup;

 					goto error;

 				}

 				if (regcomp(re, right->s, REG_EXTENDED|REG_NOSUB|REG_ICASE)) {

 					pkg_free(re);

+					left->s[left->len] = backup;

 					goto error;

 				}				

 				ret=(regexec(re, left->s, 0, 0, 0)==0);

+				regfree(re);

 				pkg_free(re);

 			} else {

 				ret=(regexec(r->re, left->s, 0, 0, 0)==0);

@@ -782,7 +782,7 @@ error:

 }

-int delete_avp(unsigned short flags, int_str name)

+void delete_avp(unsigned short flags, int_str name)

 {

 	struct search_state st;

 	avp_t* avp;

@@ -138,7 +138,7 @@ int add_avp(unsigned short flags, int_str name, int_str val);

 int add_avp_list(avp_list_t* list, unsigned short flags, int_str name, int_str val);

 /* Delete avps with given type and name */

-int delete_avp(unsigned short flags, int_str name);

+void delete_avp(unsigned short flags, int_str name);

 /* search functions */

 avp_t *search_first_avp( unsigned short flags, int_str name,