diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-01-20 21:18:18 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-01-20 21:18:18 +0000 |
| commit | a052b3a98b5ddb839ad5c7bb22c8ed06cfca3f58 (patch) | |
| tree | 016767623fc98e98b07e2c39e6ab1e27f4febf89 /epan/dissectors/packet-dns.c | |
| parent | 613d04a1ce869e9811eb13f4cf5a1a5b0bb5c632 (diff) | |
packet-bgp.c: Fix incorrect use of g_snprintf return value
mp_addr_to_str was unnecessary 'complex' - simplified it
packet-dns.c: Fix incorrect use of g_snprintf return value
packet-dcm.c: Fix incorrect use of g_snprintf return value
Someone who understands the protocol should look at the
"vr, tr might be used uninitialized..." warning.
packet-x11.c: Fix incorrect use of g_snprintf return value
packet-kerberos.c: Fix incorrect use of g_snprintf return value
Someone should take a look at the
"longjump might clobber ..." messages
packet-diameter.c: Fix incorrect use of g_snprintf return value
Get rid of unsigned < 0 check
packet-pgm.c: Fix incorrect use of g_snprintf return value
packet-nbns.c: Fix incorrect use of g_snprintf return value
packet-winsrepl.c: Collateral damage to packet-nbns.c fix
packet-netbios.c: Collateral damage to packet-nbns.c fix
packet-netbios.h: Collateral damage to packet-nbns.c fix
packet-kerberos.c: Collateral damage to packet-nbns.c fix
packet-nbipx.c: Collateral damage to packet-nbns.c fix
svn path=/trunk/; revision=17065
Diffstat (limited to 'epan/dissectors/packet-dns.c')
| -rw-r--r-- | epan/dissectors/packet-dns.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 6599650111..59de4a896d 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1185,19 +1185,23 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset, for (i = 0; i < 8; i++) { if (bits & mask) { if (strptr!=bitnames) - strptr += g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), ", "); + strptr += MIN(MAX_STR_LEN-(strptr-bitnames), + g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), ", ")); switch (protocol) { case IP_PROTO_TCP: - strptr += g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), get_tcp_port(port_num)); + strptr += MIN(MAX_STR_LEN-(strptr-bitnames), + g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), get_tcp_port(port_num))); break; case IP_PROTO_UDP: - strptr += g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), get_udp_port(port_num)); + strptr += MIN(MAX_STR_LEN-(strptr-bitnames), + g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), get_udp_port(port_num))); break; default: - strptr += g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), "%u", port_num); + strptr += MIN(MAX_STR_LEN-(strptr-bitnames), + g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), "%u", port_num)); break; } } @@ -2337,14 +2341,16 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (check_col(pinfo->cinfo, COL_INFO)) { bufpos=0; - bufpos+=g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, "%s%s", + bufpos+=MIN(MAX_BUF_SIZE-bufpos, + g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, "%s%s", val_to_str(opcode, opcode_vals, "Unknown operation (%u)"), - (flags&F_RESPONSE)?" response":""); + (flags&F_RESPONSE)?" response":"")); if (flags & F_RESPONSE) { if ((flags & F_RCODE) != RCODE_NOERROR) { - bufpos+=g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, ", %s", - val_to_str(flags & F_RCODE, rcode_vals, "Unknown error (%u)")); + bufpos+=MIN(MAX_BUF_SIZE-bufpos, + g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, ", %s", + val_to_str(flags & F_RCODE, rcode_vals, "Unknown error (%u)"))); } } col_add_str(pinfo->cinfo, COL_INFO, buf); @@ -2376,11 +2382,13 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset + DNS_ID, 2, id); bufpos=0; - bufpos+=g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, "%s", - val_to_str(opcode, opcode_vals, "Unknown operation")); + bufpos+=MIN(MAX_BUF_SIZE-bufpos, + g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, "%s", + val_to_str(opcode, opcode_vals, "Unknown operation"))); if (flags & F_RESPONSE) { - bufpos+=g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, " response, %s", - val_to_str(flags & F_RCODE, rcode_vals, "Unknown error")); + bufpos+=MIN(MAX_BUF_SIZE-bufpos, + g_snprintf(buf+bufpos, MAX_BUF_SIZE-bufpos, " response, %s", + val_to_str(flags & F_RCODE, rcode_vals, "Unknown error"))); } tf = proto_tree_add_uint_format(dns_tree, hf_dns_flags, tvb, offset + DNS_FLAGS, 2, |