Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/epan/dissectors/asn1/kpm-v2/kpm-v2.cnf b/epan/dissectors/asn1/kpm-v2/kpm-v2.cnf
index 03caf8e8..8181df8d 100644
--- a/epan/dissectors/asn1/kpm-v2/kpm-v2.cnf
+++ b/epan/dissectors/asn1/kpm-v2/kpm-v2.cnf
@@ -50,7 +50,7 @@ E2SM-KPM-RANfunction-Description
   if (!actx->pinfo->fd->visited) {
     /* N.B. too early to work out exact dissector, as don't have OID yet */
     e2ap_store_ran_function_mapping(actx->pinfo, tree, value_tvb,
-                                    tvb_get_string_enc(wmem_packet_scope(), value_tvb, 0, tvb_captured_length(value_tvb), ENC_ASCII));
+                                    tvb_get_string_enc(actx->pinfo->pool, value_tvb, 0, tvb_captured_length(value_tvb), ENC_ASCII));
   }
 
 
diff --git a/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c b/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c
index ebb8f417..9bef7896 100644
--- a/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c
+++ b/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c
@@ -15,6 +15,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-e2ap.h"
 #include "packet-per.h"
@@ -32,10 +33,10 @@ void proto_reg_handoff_kpm_v2(void);
 #include "packet-kpm-v2-val.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_kpm_v2 = -1;
+static int proto_kpm_v2;
 #include "packet-kpm-v2-hf.c"
 
-static int hf_kpm_v2_timestamp_string = -1;
+static int hf_kpm_v2_timestamp_string;
 
 
 #include "packet-kpm-v2-ett.c"
@@ -96,7 +97,7 @@ void proto_register_kpm_v2(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
 #include "packet-kpm-v2-ettarr.c"
   };