From 6c83e2b2b78728a2ea8d6be4e9fcd8976392c031 Mon Sep 17 00:00:00 2001
From: Vlad Paiu <vladpaiu@opensips.org>
Date: Mon, 25 Aug 2014 12:51:57 +0300
Subject: [PATCH] Fixed simplified callid parser (cherry picked from commit
 3316a2a518a2ac27401408369e4bd3adc70b4e48)

---
 parser/msg_parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parser/msg_parser.c b/parser/msg_parser.c
index 7450d61dcb0..e77f94584ec 100644
--- a/parser/msg_parser.c
+++ b/parser/msg_parser.c
@@ -905,13 +905,13 @@ int extract_ftc_hdrs( char *buf, int len, str *from, str *to, str *cseq,str *cal
 				if (state!=2) {state = 1;break;}
 				/* hdr starting with 'c' */
 				if (cseq==0 && callid == 0) break;
-				if (p+3<end && LC(p+1)=='s' && LC(p+2)=='e' && LC(p+3)=='q') {
+				if (cseq && p+3<end && LC(p+1)=='s' && LC(p+2)=='e' && LC(p+3)=='q') {
 					b = p;
 					p+=3;
 					state = 4; /* "cseq" found */
 					fill = cseq;
 					flag = 0x4;
-				} else if (p+6<end && LC(p+1)=='a' && LC(p+2) == 'l' &&
+				} else if (callid && p+6<end && LC(p+1)=='a' && LC(p+2) == 'l' &&
 					LC(p+3) == 'l' && LC(p+4) == '-' && LC(p+5) == 'i' &&
 					LC(p+6) == 'd') {
 					b = p;