osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More size_t fixes. Use a string buffer in range.c. 

svn path=/trunk/; revision=27999
This commit is contained in:
Gerald Combs 2009-04-08 16:50:20 +00:00
parent 642e4a3e36
commit f0eeb0bdf1
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/proto.c
View File

@ -3176,7 +3176,7 @@ proto_item_append_text(proto_item *pi, const char *format, ...)
curlen = strlen(fi->rep->representation);
if (ITEM_LABEL_LENGTH > curlen) {
g_vsnprintf(fi->rep->representation + curlen,
ITEM_LABEL_LENGTH - curlen, format, ap);
ITEM_LABEL_LENGTH - (gulong) curlen, format, ap);
}
va_end(ap);
}
@ -4190,7 +4190,7 @@ fill_label_boolean(field_info *fi, gchar *label_str)
/* Create the bitfield first */
p = decode_bitfield_value(label_str, unshifted_value, hfinfo->bitmask, bitwidth);
bitfield_byte_length = p - label_str;
bitfield_byte_length = (int) (p - label_str);
}
/* Fill in the textual info */
@ -4223,7 +4223,7 @@ fill_label_bitfield(field_info *fi, gchar *label_str)
/* Create the bitfield first */
p = decode_bitfield_value(label_str, unshifted_value, hfinfo->bitmask, bitwidth);
bitfield_byte_length = p - label_str;
bitfield_byte_length = (int) (p - label_str);
/* Fill in the textual info using stored (shifted) value */
if (hfinfo->display == BASE_CUSTOM) {
@ -5491,7 +5491,7 @@ construct_match_selected_string(field_info *finfo, epan_dissect_t *edt,
hfinfo = finfo->hfinfo;
DISSECTOR_ASSERT(hfinfo);
abbrev_len = strlen(hfinfo->abbrev);
abbrev_len = (int) strlen(hfinfo->abbrev);
if (hfinfo->strings && (hfinfo->display & BASE_STRUCTURE_RESET) == BASE_NONE) {
const gchar *str = NULL;
@ -5648,16 +5648,16 @@ construct_match_selected_string(field_info *finfo, epan_dissect_t *edt,
*filter = ep_alloc0(buf_len);
ptr = *filter;
ptr += g_snprintf(ptr, buf_len-(ptr-*filter),
ptr += g_snprintf(ptr, (gulong) (buf_len-(ptr-*filter)),
"frame[%d:%d] == ", finfo->start, length);
for (i=0;i<length; i++) {
c = tvb_get_guint8(finfo->ds_tvb, start);
start++;
if (i == 0 ) {
ptr += g_snprintf(ptr, buf_len-(ptr-*filter), "%02x", c);
ptr += g_snprintf(ptr, (gulong) (buf_len-(ptr-*filter)), "%02x", c);
}
else {
ptr += g_snprintf(ptr, buf_len-(ptr-*filter), ":%02x", c);
ptr += g_snprintf(ptr, (gulong) (buf_len-(ptr-*filter)), ":%02x", c);
}
}
}

17
epan/range.c
View File

@ -295,21 +295,20 @@ range_convert_range(range_t *range)
{
guint32 i;
gboolean prepend_comma = FALSE;
char *string, *str;
emem_strbuf_t *strbuf;
string=ep_alloc(128);
string[0]=0;
str=string;
strbuf=ep_strbuf_new("");
for (i=0; i < range->nranges; i++) {
if (range->ranges[i].low == range->ranges[i].high)
str += g_snprintf(str, 128-(str-string), "%s%u", prepend_comma?",":"", range->ranges[i].low);
else
str += g_snprintf(str, 128-(str-string), "%s%u-%u", prepend_comma?",":"", range->ranges[i].low, range->ranges[i].high);
if (range->ranges[i].low == range->ranges[i].high) {
ep_strbuf_append_printf(strbuf, "%s%u", prepend_comma?",":"", range->ranges[i].low);
} else {
ep_strbuf_append_printf(strbuf, "%s%u-%u", prepend_comma?",":"", range->ranges[i].low, range->ranges[i].high);
}
prepend_comma = TRUE;
}
return string;
return strbuf->str;
}
/* Create a copy of a range. */

2
epan/req_resp_hdrs.c
View File

@ -190,7 +190,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, const int offset, packet_info *pinfo,
header_val = tvb_get_ephemeral_string(tvb,
next_offset_sav + 18, linelen - 18);
p = header_val;
len = strlen(header_val);
len = (guint) strlen(header_val);
/* Skip white space */
while (p < header_val + len &&
(*p == ' ' || *p == '\t'))

2
epan/stats_tree.c
View File

@ -98,7 +98,7 @@ stats_tree_branch_max_namelen(const stat_node *node, guint indent)
}
}
len = strlen(node->name) + indent;
len = (guint) strlen(node->name) + indent;
maxlen = len > maxlen ? len : maxlen;
return maxlen;

2
epan/strutil.c
View File

@ -126,7 +126,7 @@ get_token_len(const guchar *linep, const guchar *lineend,
*/
while (linep < lineend && *linep != ' ' && *linep != '\r' && *linep != '\n')
linep++;
token_len = linep - tokenp;
token_len = (int) (linep - tokenp);
/*
* Skip trailing blanks.