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/kerberos | |
| 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/kerberos')
| -rw-r--r-- | asn1/kerberos/kerberos.cnf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index ccbd847811..b63c864b83 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -112,7 +112,7 @@ guint32 msgtype; #.FN_BODY PADATA-TYPE - actx->value_ptr = ep_alloc(sizeof(guint32)); + actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, (guint32*)actx->value_ptr); @@ -187,7 +187,7 @@ guint32 msgtype; addr_type = *((guint32*)actx->value_ptr); } - address_str=(char*)ep_alloc(ADDRESS_STR_BUFSIZ); + address_str=(char*)wmem_alloc(wmem_packet_scope(), ADDRESS_STR_BUFSIZ); address_str[0]=0; switch(addr_type){ case KRB5_ADDR_IPv4: @@ -228,7 +228,7 @@ guint32 msgtype; #xxx TYPE = FT_UINT16 DISPLAY = BASE_DEC STRINGS = VALS(xx_vals) #.FN_BODY ENCTYPE - actx->value_ptr = ep_alloc(sizeof(guint32)); + actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, (guint32*)actx->value_ptr); @@ -291,7 +291,7 @@ guint32 msgtype; #.FN_BODY CKSUMTYPE - actx->value_ptr = ep_alloc(sizeof(guint32)); + actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, (guint32*)actx->value_ptr); @@ -315,7 +315,7 @@ guint32 msgtype; return offset; #.FN_BODY EncryptionKey/keytype - kerberos_key_t* key = (kerberos_key_t*)ep_alloc(sizeof(kerberos_key_t)); + kerberos_key_t* key = (kerberos_key_t*)wmem_alloc(wmem_packet_scope(), sizeof(kerberos_key_t)); actx->value_ptr = key; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -344,7 +344,7 @@ guint32 msgtype; } #.FN_BODY AuthorizationData/_item/ad-type - actx->value_ptr = ep_alloc(sizeof(guint32)); + actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, (guint32*)actx->value_ptr); @@ -365,7 +365,7 @@ guint32 msgtype; } #.FN_BODY HostAddress/addr-type - actx->value_ptr = ep_alloc(sizeof(guint32)); + actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, (guint32*)actx->value_ptr); |