diff options
| -rw-r--r-- | asn1/acse/acse.cnf | 2 | ||||
| -rw-r--r-- | asn1/rtse/rtse.cnf | 2 | ||||
| -rw-r--r-- | asn1/x411/x411.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-acse.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtse.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-x411.c | 4 |
7 files changed, 13 insertions, 10 deletions
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index e3d012711a..6e407f1336 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -85,7 +85,7 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name /* look up the indirect reference */ if((oid = find_oid_by_pres_ctx_id(pinfo, indir_ref)) != NULL) { - strcpy(object_identifier_id, oid); + g_snprintf(object_identifier_id, MAX_OID_STR_LEN, "%s", oid); } if(session) diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index 3f099786ee..f84391e0ec 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -100,7 +100,7 @@ EXTERNAL /* look up the indirect reference */ if((oid = find_oid_by_pres_ctx_id(pinfo, indir_ref)) != NULL) { - strcpy(object_identifier_id, oid); + g_snprintf(object_identifier_id, MAX_OID_STR_LEN, "%s", oid); } diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index bdffcc4067..0f3c24de48 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -272,10 +272,10 @@ UniversalOrganizationalUnitNames B "x411.extension-attribute.27" "universal-orga /* convert integer content type to oid for dispatch when the content is found */ switch(ict) { case 2: - strcpy(object_identifier_id, "2.6.1.10.0"); + g_snprintf(object_identifier_id, BER_MAX_OID_STR_LEN, "2.6.1.10.0"); break; case 22: - strcpy(object_identifier_id, "2.6.1.10.1"); + g_snprintf(object_identifier_id, BER_MAX_OID_STR_LEN, "2.6.1.10.1"); break; default: break; diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 9593d05927..6b486abe7d 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -328,7 +328,7 @@ dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int /* look up the indirect reference */ if((oid = find_oid_by_pres_ctx_id(pinfo, indir_ref)) != NULL) { - strcpy(object_identifier_id, oid); + g_snprintf(object_identifier_id, MAX_OID_STR_LEN, "{'FN_VARIANT': '', 'VAL_PTR': 'NULL', 'TREE': 'tree', 'DEFAULT_BODY': ' offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,\n NULL);\n', 'HF_INDEX': 'hf_index', 'PINFO': 'pinfo', 'CREATED_ITEM_PTR': 'NULL', 'OFFSET': 'offset', 'TNAME': 'T_indirect_reference', 'TVB': 'tvb', 'IMPLICIT_TAG': 'implicit_tag', 'ER': 'ber'}", oid); } if(session) diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 78680ec0b3..0c48b25e8b 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-rtse.c */ +/* ./packet-rtse.c */ /* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ /* Input file: packet-rtse-template.c */ @@ -64,6 +64,9 @@ static guint32 app_proto=0; static proto_tree *top_tree=NULL; +static int dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_); + + /*--- Included file: packet-rtse-hf.c ---*/ @@ -659,7 +662,7 @@ dissect_rtse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int /* look up the indirect reference */ if((oid = find_oid_by_pres_ctx_id(pinfo, indir_ref)) != NULL) { - strcpy(object_identifier_id, oid); + g_snprintf(object_identifier_id, MAX_OID_STR_LEN, "{'FN_VARIANT': '', 'VAL_PTR': 'NULL', 'TREE': 'tree', 'DEFAULT_BODY': ' offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,\n NULL);\n', 'HF_INDEX': 'hf_index', 'PINFO': 'pinfo', 'CREATED_ITEM_PTR': 'NULL', 'OFFSET': 'offset', 'TNAME': 'T_indirect_reference', 'TVB': 'tvb', 'IMPLICIT_TAG': 'implicit_tag', 'ER': 'ber'}", oid); } diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h index fdeb2b170e..2757ebf0d6 100644 --- a/epan/dissectors/packet-rtse.h +++ b/epan/dissectors/packet-rtse.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-rtse.h */ +/* ./packet-rtse.h */ /* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ /* Input file: packet-rtse-template.h */ diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index c3fe134c64..9a3b01bae5 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -1906,10 +1906,10 @@ dissect_x411_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int of /* convert integer content type to oid for dispatch when the content is found */ switch(ict) { case 2: - strcpy(object_identifier_id, "2.6.1.10.0"); + g_snprintf(object_identifier_id, BER_MAX_OID_STR_LEN, "2.6.1.10.0"); break; case 22: - strcpy(object_identifier_id, "2.6.1.10.1"); + g_snprintf(object_identifier_id, BER_MAX_OID_STR_LEN, "2.6.1.10.1"); break; default: break; |