@@ -272,7 +272,8 @@ DEFS+= $(extra_defs) \

 	 -DUSE_IPV6 \

 	 -DUSE_TCP \

 	 -DDISABLE_NAGLE \

-	 -DF_MALLOC \

+	 -DDBG_QM_MALLOC \

+	# -DF_MALLOC \

 	# -DDBG_F_MALLOC \

 	# -DDBG_QM_MALLOC \

 	 #-DF_MALLOC \

@@ -3,6 +3,13 @@ Release notes for SIP Express Router (ser)

 $Id$

+0.8.12 changes

+

+texops:

+ - subst('s/re/repl/flags') support

+

+

+

 ***********************************************

 * Changes introduced in 0.8.11

 ***********************************************

@@ -11,6 +11,8 @@ $Id$

 - port receive.c pre_script_cb fix from stable

 - extend alias to include port numbers :

     something like alias= foo1.bar:5080 foo2.bar foo3.bar:*

+- extend listen and alias to include port numbers and protocol:

+       tcp foo.bar:5063, udp foo.bar:5062, foo2.bar

 release:

 - change tcp timeouts to 2 or 3 min?

@@ -451,7 +451,8 @@ error:

-/* return the substitution result in a str, input must be 0 term */ 

+/* returns the substitution result in a str, input must be 0 term

+ *  0 on no match or malloc error */ 

 str* subst_str(char *input, struct sip_msg* msg, struct subst_expr* se)

 {

 	str* res;

@@ -468,14 +469,23 @@ str* subst_str(char *input, struct sip_msg* msg, struct subst_expr* se)

 	len=strlen(input);

 	end=input+len;

 	lst=subst_run(se, input, msg);

-	for (l=lst; l; l=l->next)

+	if (lst==0){

+		DBG("subst_str: no match\n");

+		return 0;

+	}

+	DBG("subst_str: orig len: %d\n", len);

+	for (l=lst; l; l=l->next){

+		DBG("subst_str: len+=%d (size=%d)\n", l->rpl.len-l->size, l->size );

 		len+=(int)(l->rpl.len)-l->size;

+	}

+	DBG("subst_str: new len: %d\n", len);

 	res=pkg_malloc(sizeof(str));

 	if (res==0){

 		LOG(L_ERR, "ERROR: subst_str: mem. allocation error\n");

 		goto error;

 	}

-	res->s=pkg_malloc(len);

+	res->s=pkg_malloc(len+1); /* space for null termination */

+	res->s[len]=0;

 	if (res->s==0){

 		LOG(L_ERR, "ERROR: subst_str: mem. allocation error (res->s)\n");

 		goto error;

@@ -487,8 +497,8 @@ str* subst_str(char *input, struct sip_msg* msg, struct subst_expr* se)

 	p=input;

 	for(l=lst; l; l=l->next){

 		size=l->offset+input-p;

-		memcpy(dest, p, size);

-		p+=size;

+		memcpy(dest, p, size); /* copy till offset */

+		p+=size + l->size; /* skip l->size bytes */

 		dest+=size;

 		if (l->rpl.len){

 			memcpy(dest, l->rpl.s, l->rpl.len);

@@ -170,7 +170,7 @@ static inline int version_control(void *handle, char *path)

 	}

 	if (strcmp(VERSION,*m_ver)==0)

 		return 1;

-	LOG(L_ERR, "ERRO: module version mismatch for %s; "

+	LOG(L_ERR, "ERROR: module version mismatch for %s; "

 		"core: %s; module: %s\n", path, VERSION, *m_ver );

 	return 0;

 }