diff options
| author | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
| commit | 8b0f1addd990ae1b6616dbb5a21e530942461154 (patch) | |
| tree | e72f102e0cec19ee49b5729f8dcfa62afa3a931d /asn1/p1 | |
| parent | e6e7c1181bd33a94de00e137685f39520bd858dc (diff) | |
Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.
svn path=/trunk/; revision=50066
Diffstat (limited to 'asn1/p1')
| -rw-r--r-- | asn1/p1/p1.cnf | 14 | ||||
| -rw-r--r-- | asn1/p1/packet-p1-template.c | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 1c6b44a91e..7d8f4c3f34 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -640,10 +640,10 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" /* convert integer content type to oid for dispatch when the content is found */ switch(ict) { case 2: - content_type_id = ep_strdup("2.6.1.10.0"); + content_type_id = wmem_strdup(wmem_packet_scope(), "2.6.1.10.0"); break; case 22: - content_type_id = ep_strdup("2.6.1.10.1"); + content_type_id = wmem_strdup(wmem_packet_scope(), "2.6.1.10.1"); break; default: content_type_id = NULL; @@ -938,7 +938,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" #.FN_BODY TeletexDomainDefinedAttribute - ddatype = (char *)ep_alloc(MAX_ORA_STR_LEN); ddatype[0] = '\0'; + ddatype = (char *)wmem_alloc(wmem_packet_scope(), MAX_ORA_STR_LEN); ddatype[0] = '\0'; %(DEFAULT_BODY)s @@ -1047,13 +1047,13 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" } #.FN_BODY BuiltInDomainDefinedAttribute - ddatype = (char *)ep_alloc(MAX_ORA_STR_LEN); ddatype[0] = '\0'; + ddatype = (char *)wmem_alloc(wmem_packet_scope(), MAX_ORA_STR_LEN); ddatype[0] = '\0'; %(DEFAULT_BODY)s #.FN_BODY ORAddress - oraddress = (char *)ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; + oraddress = (char *)wmem_alloc(wmem_packet_scope(), MAX_ORA_STR_LEN); oraddress[0] = '\0'; doing_address = TRUE; address_item = NULL; @@ -1066,7 +1066,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" #.FN_BODY ORName - oraddress = (char *)ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; + oraddress = (char *)wmem_alloc(wmem_packet_scope(), MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = NULL; doing_address = TRUE; @@ -1085,7 +1085,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" #.FN_BODY GlobalDomainIdentifier - oraddress = (char *)ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; + oraddress = (char *)wmem_alloc(wmem_packet_scope(), MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = tree; %(DEFAULT_BODY)s diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index cb6cb2a8c8..0c47d17b8a 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -31,6 +31,7 @@ #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> +#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-acse.h" |