Fix 0'ed msg passed to callbacks on parse error.

This is a complition to af754d9
In receive_msg(), even upon a parse error, we need the cripled msg to be passed to "error" handling callbacks (like pike or error_route).

Author: bogdan-iancu

parser/msg_parser.c

@@ -818,7 +818,8 @@ int clone_headers(struct sip_msg *from_msg, struct sip_msg *to_msg)
 
 
 /* returns 0 if ok, -1 for errors */
-int parse_msg(char* buf, unsigned int len, struct sip_msg* msg)
+int parse_msg_opt(char* buf, unsigned int len, struct sip_msg* msg,
+															int free_on_err)
 {
 
 	char *tmp;
@@ -925,9 +926,12 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg)
 	return 0;
 
 parse_error:
-	/* Free the SIP message if it has already been created to prevent memory leaks */
-	free_sip_msg(msg);
-	memset(msg, 0, sizeof(*msg));
+	if (free_on_err) {
+		/* Free the SIP message if it has already been created to
+		 * prevent memory leaks */
+		free_sip_msg(msg);
+		memset(msg, 0, sizeof(*msg));
+	}
 
 error:
 	/* more debugging, msg->orig is/should be null terminated*/

parser/msg_parser.h

@@ -363,7 +363,11 @@ struct sip_msg {
 
 extern int via_cnt;
 
-int parse_msg(char* buf, unsigned int len, struct sip_msg* msg);
+#define parse_msg( _buf, _len, _msg) \
+	parse_msg_opt( _buf, _len, _msg, 1)
+
+int parse_msg_opt(char* buf, unsigned int len, struct sip_msg* msg,
+		int free_on_err);
 
 #define parse_headers(msg, flags,next) 	parse_headers_aux(msg,flags,next, 1)
 

receive.c

@@ -152,7 +152,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info,
 	msg->msg_flags=msg_flags;
 	msg->ruri_q = Q_UNSPECIFIED;
 
-	if (parse_msg(in_buff.s,len, msg)!=0){
+	if (parse_msg_opt(in_buff.s,len, msg, 0)!=0){
 		tmp=ip_addr2a(&(rcv_info->src_ip));
 		LM_ERR("Unable to parse msg received from [%s:%d]\n",
 			tmp, rcv_info->src_port);