diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-13 23:11:14 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-13 23:11:14 +0000 |
| commit | d6da7a01b1adefac1016f3c7fa0141ef8b308fe8 (patch) | |
| tree | eb2cc1626b38c6ce54846476c46f5fc39f9b2565 /epan/dissectors/packet-iscsi.c | |
| parent | 24360c9951d81e35eece87c50cd22584a44b7b2f (diff) | |
Fix warnings + remove some v. old comment from strutil.h
svn path=/trunk/; revision=54078
Diffstat (limited to 'epan/dissectors/packet-iscsi.c')
| -rw-r--r-- | epan/dissectors/packet-iscsi.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index a0830726f0..0e354024ab 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -556,6 +556,8 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val) /* looks like a ipv4 address */ p = strchr(value, ':'); if (p != NULL) { + char *addr_data; + *p++ = 0; pgt = strchr(p, ','); @@ -563,14 +565,16 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val) *pgt++ = 0; } + addr_data = (char *) wmem_alloc(wmem_packet_scope(), 4); + addr_data[0] = i0; + addr_data[1] = i1; + addr_data[2] = i2; + addr_data[3] = i3; + addr = wmem_new(wmem_packet_scope(), address); addr->type = AT_IPv4; addr->len = 4; - addr->data = wmem_alloc(wmem_packet_scope(), 4); - ((char *)addr->data)[0] = i0; - ((char *)addr->data)[1] = i1; - ((char *)addr->data)[2] = i2; - ((char *)addr->data)[3] = i3; + addr->data = addr_data; port = atoi(p); } |