5 files changed, 9 insertions, 9 deletions
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 018fde9b3f..76dc2b93d6 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -115,14 +115,14 @@ guint32 value;
 static gboolean contains_faststart = FALSE;
 
 /* NonStandardParameter */
-static char *nsiOID;
+static const char *nsiOID;
 static guint32 h221NonStandard;
 static guint32 t35CountryCode;
 static guint32 t35Extension;
 static guint32 manufacturerCode;
 
 /* TunnelledProtocol */
-static char *tpOID;
+static const char *tpOID;
 
 #include "packet-h225-fn.c"
 
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 4bc2b01839..2c8588066a 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -200,7 +200,7 @@ static const value_string h245_AudioCapability_short_vals[] = {
    an OLC is read */
 
 const char* codec_type = NULL;
-static char *standard_oid_str;
+static const char *standard_oid_str;
 static guint32 ipv4_address;
 static guint32 ipv4_port;
 static guint32 rtcp_ipv4_address;
@@ -209,7 +209,7 @@ static gboolean media_channel;
 static gboolean media_control_channel;
 
 /* NonStandardParameter */
-static char *nsiOID;
+static const char *nsiOID;
 static guint32 h221NonStandard;
 static guint32 t35CountryCode;
 static guint32 t35Extension;
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 767b331290..a9831c1282 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1109,14 +1109,14 @@ guint32 value;
 static gboolean contains_faststart = FALSE;
 
 /* NonStandardParameter */
-static char *nsiOID;
+static const char *nsiOID;
 static guint32 h221NonStandard;
 static guint32 t35CountryCode;
 static guint32 t35Extension;
 static guint32 manufacturerCode;
 
 /* TunnelledProtocol */
-static char *tpOID;
+static const char *tpOID;
 
 
 /*--- Included file: packet-h225-fn.c ---*/
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 88a0881b9c..ace49915d6 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -207,7 +207,7 @@ static const value_string h245_AudioCapability_short_vals[] = {
    an OLC is read */
 
 const char* codec_type = NULL;
-static char *standard_oid_str;
+static const char *standard_oid_str;
 static guint32 ipv4_address;
 static guint32 ipv4_port;
 static guint32 rtcp_ipv4_address;
@@ -216,7 +216,7 @@ static gboolean media_channel;
 static gboolean media_control_channel;
 
 /* NonStandardParameter */
-static char *nsiOID;
+static const char *nsiOID;
 static guint32 h221NonStandard;
 static guint32 t35CountryCode;
 static guint32 t35Extension;
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index 06f35d3ec4..af40187d34 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -606,7 +606,7 @@ dissect_per_object_identifier(tvbuff_t *tvb, guint32 offset, packet_info *pinfo
 {
   guint length;
   char *str, *name;
-  proto_item *item;
+  proto_item *item = NULL;
   header_field_info *hfi;
 
 DEBUG_ENTRY("dissect_per_object_identifier");