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-diameter.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-diameter.c')
| -rw-r--r-- | epan/dissectors/packet-diameter.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index f5e0bb3aa5..acdf32a968 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -664,7 +664,7 @@ dictionaryAddApplication(char *name, guint32 id) { ApplicationId *entry; - if (!name || (id < 0) || (id == 0 && !allow_zero_as_app_id)) { + if (!name || (id == 0 && !allow_zero_as_app_id)) { report_failure( "Diameter Error: Invalid application (name=%p, id=%d)", name, id); return (-1); @@ -1275,9 +1275,11 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bpos = 1 << i; if (flags & bpos) { if (flagstr[0]) { - fslen+=g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, ", "); + fslen+=MIN(FLAG_STR_LEN-fslen, + g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, ", ")); } - fslen+=g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, "%s", fstr[i]); + fslen+=MIN(FLAG_STR_LEN-fslen, + g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, "%s", fstr[i])); } } if (flagstr[0] == 0) { @@ -1626,9 +1628,11 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree bpos = 1 << i; if (flags & bpos) { if (flagstr[0]) { - fslen+=g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, ", "); + fslen+=MIN(FLAG_STR_LEN-fslen, + g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, ", ")); } - fslen+=g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, "%s", fstr[i]); + fslen+=MIN(FLAG_STR_LEN-fslen, + g_snprintf(flagstr+fslen, FLAG_STR_LEN-fslen, "%s", fstr[i])); } } if (flagstr[0] == 0) { |