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

snprintf -> strlcpy. 

svn path=/trunk/; revision=50311
This commit is contained in:
Jakub Zawadzki 2013-07-02 14:14:52 +00:00
parent 14d105ee4c
commit d0c5a5561d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/proto.c
View File

@ -3859,9 +3859,8 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence,
tfstring->true_string :
tfstring->false_string, size-offset_r);
g_snprintf(expr+offset_e, size-offset_e, "%u",
fvalue_get_uinteger(&finfo->value) ? 1 : 0);
offset_e = (int)strlen(expr);
offset_e += protoo_strlcpy(expr+offset_e,
u_integer ? "1" : "0", size-offset_e);
break;
case FT_UINT8:
@ -3876,7 +3875,7 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence,
DISSECTOR_ASSERT(fmtfunc);
fmtfunc(tmp, u_integer);
g_snprintf(result+offset_r, size-offset_r, "%s", tmp);
g_strlcpy(result+offset_r, tmp, size-offset_r);
} else if (hfinfo->strings) {
const char *str_val = hf_try_val_to_str(u_integer, hfinfo);
@ -3935,7 +3934,7 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence,
DISSECTOR_ASSERT(fmtfunc);
fmtfunc(tmp, integer);
g_snprintf(result+offset_r, size-offset_r, "%s", tmp);
g_strlcpy(result+offset_r, tmp, size-offset_r);
} else if (hfinfo->strings) {
const char *str_val = hf_try_val_to_str(integer, hfinfo);