11127 libsip: NULL pointer errors

Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

1 files changed, 23 insertions, 27 deletions

diff --git a/usr/src/lib/libsip/common/sip_parse_hdrs.c b/usr/src/lib/libsip/common/sip_parse_hdrs.c
index e7ee91acad..39486323b2 100644
--- a/usr/src/lib/libsip/common/sip_parse_hdrs.c
+++ b/usr/src/lib/libsip/common/sip_parse_hdrs.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -63,9 +61,9 @@ sip_parse_acpt_header(_sip_header_t *sip_header, sip_parsed_header_t **header)
  */
 int
 sip_parse_acpt_encode_header(_sip_header_t *sip_header,
-	sip_parsed_header_t **header)
+    sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -75,11 +73,11 @@ sip_parse_acpt_encode_header(_sip_header_t *sip_header,
  */
 int
 sip_parse_acpt_lang_header(_sip_header_t *sip_header,
-	sip_parsed_header_t **header)
+    sip_parsed_header_t **header)
 {
 	if (sip_is_empty_hdr(sip_header))
 		return (sip_parse_hdr_empty(sip_header, header));
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -132,8 +130,7 @@ sip_parse_allow_header(_sip_header_t *hdr, sip_parsed_header_t **phdr)
 		value->sip_value_start = hdr->sip_hdr_current;
 		value->sip_value_header = parsed_header;
 
-		if (sip_find_separator(hdr, SIP_COMMA, (char)NULL,
-		    (char)NULL, B_FALSE) == 0) {
+		if (sip_find_separator(hdr, SIP_COMMA, 0, 0, B_FALSE) == 0) {
 			multi_value = B_TRUE;
 		}
 
@@ -196,7 +193,7 @@ int
 sip_parse_contentdis_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -207,7 +204,7 @@ int
 sip_parse_contentencode_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -221,7 +218,7 @@ int
 sip_parse_contentlang_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -355,7 +352,7 @@ int
 sip_parse_inreplyto_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -449,7 +446,7 @@ int
 sip_parse_privacy_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 
@@ -460,7 +457,7 @@ int
 sip_parse_require_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -570,7 +567,7 @@ sip_parse_support_header(_sip_header_t *sip_header,
 {
 	if (sip_is_empty_hdr(sip_header))
 		return (sip_parse_hdr_empty(sip_header, header));
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -654,7 +651,7 @@ int
 sip_parse_usupport_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -877,7 +874,7 @@ int
 sip_parse_allow_events_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -893,18 +890,18 @@ sip_parse_allow_events_header(_sip_header_t *sip_header,
 int
 sip_parse_event_header(_sip_header_t *sip_header, sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
  * Subscription-State   = "Subscription-State" HCOLON substate-value
- * 			*( SEMI subexp-params )
+ *			*( SEMI subexp-params )
  * substate-value       = "active" / "pending" / "terminated"
  *			/ extension-substate
  * extension-substate   = token
  * subexp-params        =   ("reason" EQUAL event-reason-value)
  *			/ ("expires" EQUAL delta-seconds)*
- * 			/ ("retry-after" EQUAL delta-seconds)
+ *			/ ("retry-after" EQUAL delta-seconds)
  *			/ generic-param
  * event-reason-value   =   "deactivated"
  *				/ "probation"
@@ -919,7 +916,7 @@ int
 sip_parse_substate_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -944,7 +941,7 @@ sip_parse_substate_header(_sip_header_t *sip_header,
  * dresponse         =  "response" EQUAL request-digest
  * request-digest    =  LDQUOT 32LHEX RDQUOT
  * auth-param        =  auth-param-name EQUAL
- * 			( token / quoted-string )
+ *			( token / quoted-string )
  * auth-param-name   =  token
  * other-response    =  auth-scheme LWS auth-param
  *			*(COMMA auth-param)
@@ -972,7 +969,7 @@ int
 sip_parse_ainfo_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -980,7 +977,7 @@ sip_parse_ainfo_header(_sip_header_t *sip_header,
  * challenge           =  ("Digest" LWS digest-cln *(COMMA digest-cln))
  *				/ other-challenge
  * other-challenge     =  auth-scheme LWS auth-param
- * 				*(COMMA auth-param)
+ *				*(COMMA auth-param)
  * digest-cln          =  realm / domain / nonce
  *				/ opaque / stale / algorithm
  *				/ qop-options / auth-param
@@ -1026,7 +1023,7 @@ int
 sip_parse_preq_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -1581,8 +1578,7 @@ sip_parse_cftr_header(_sip_header_t *sip_header, sip_parsed_header_t **header)
 
 		tmp_ptr = sip_header->sip_hdr_current;
 
-		if (sip_find_separator(sip_header, SIP_RAQUOT, (char)NULL,
-		    (char)NULL, B_FALSE)) {
+		if (sip_find_separator(sip_header, SIP_RAQUOT, 0, 0, B_FALSE)) {
 			if (sip_goto_next_value(sip_header) != 0) {
 				sip_free_cftr_header(parsed_header);
 				return (EPROTO);