Try to differentiate a non filled private_data (pointer set to NULL) from an enum with value = 0

svn path=/trunk/; revision=50837

1 files changed, 9 insertions, 9 deletions

diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 1c23d801ae..8fd0da8c3e 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -16566,7 +16566,7 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1
   length = tvb_length(nas_sys_info_gsm_map_tvb);
   if (length) {
     if (actx->private_data) {
-      switch (GPOINTER_TO_UINT(actx->private_data)) {
+      switch (GPOINTER_TO_UINT(actx->private_data)-1) {
         case RRC_NAS_SYS_INFO_CN_COMMON:
           item = proto_tree_add_text(tree, nas_sys_info_gsm_map_tvb, 0, length, "CN Common GSM-MAP NAS system information");
           subtree = proto_item_add_subtree(item, ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo);
@@ -16600,7 +16600,7 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 663 "../../asn1/rrc/rrc.cnf"
-  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON);
+  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
 
@@ -16624,7 +16624,7 @@ dissect_rrc_CN_DomainIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, &nas_sys_info_gsm_map, FALSE, 0, NULL);
 
-  actx->private_data = GUINT_TO_POINTER(nas_sys_info_gsm_map);
+  actx->private_data = GUINT_TO_POINTER(nas_sys_info_gsm_map+1);
 
 
 
@@ -20522,7 +20522,7 @@ dissect_rrc_E_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 667 "../../asn1/rrc/rrc.cnf"
-  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON);
+  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
 
@@ -84167,7 +84167,7 @@ dissect_rrc_UE_ConnTimersAndConstants(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 671 "../../asn1/rrc/rrc.cnf"
-  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON);
+  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
 
@@ -87509,7 +87509,7 @@ dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
   }
   /*Retrieve the start value for the two ciphering domains*/
   if (actx->private_data) {
-    switch(GPOINTER_TO_UINT(actx->private_data)){
+    switch(GPOINTER_TO_UINT(actx->private_data)-1){
       case RRC_NAS_SYS_INFO_CS:
         /*
         g_warning("Not implemented");
@@ -114326,7 +114326,7 @@ static const per_sequence_t UE_SecurityInformation_sequence[] = {
 static int
 dissect_rrc_UE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 898 "../../asn1/rrc/rrc.cnf"
-  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CS);
+  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CS+1);
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UE_SecurityInformation, UE_SecurityInformation_sequence);
 
@@ -114729,7 +114729,7 @@ static const per_sequence_t UE_SecurityInformation2_sequence[] = {
 static int
 dissect_rrc_UE_SecurityInformation2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 902 "../../asn1/rrc/rrc.cnf"
-  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_PS);
+  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_PS+1);
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UE_SecurityInformation2, UE_SecurityInformation2_sequence);
 
@@ -133140,7 +133140,7 @@ dissect_rrc_SIB_ReferenceList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 675 "../../asn1/rrc/rrc.cnf"
-  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON);
+  actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);