diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-05-10 16:37:44 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-10 22:49:25 +0000 |
| commit | 4d3df66af44b563a1c6d6fe03fcdf09f93877dba (patch) | |
| tree | a9d9927c9c20bfdc0b304f439a024b34fd55eac3 /epan/ftypes/ftype-time.c | |
| parent | 1dccd1ee072722fbe6d5e1a9d726a7e87d191f76 (diff) | |
Give FvalueToStringRepr a length parameter.
This allows the conversion of a few straggler strcpy calls
in ftype library. Also provides a more accurate size value
instead of the many hard coded values the ftypes were using.
Change-Id: Ia6273980432e16ad3a6233816a6054d9fed5d2a4
Reviewed-on: https://code.wireshark.org/review/15344
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/ftypes/ftype-time.c')
| -rw-r--r-- | epan/ftypes/ftype-time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c index c36bf14d5c..f9d057bd44 100644 --- a/epan/ftypes/ftype-time.c +++ b/epan/ftypes/ftype-time.c @@ -339,7 +339,7 @@ absolute_val_repr_len(fvalue_t *fv, ftrepr_t rtype, int field_display _U_) } static void -absolute_val_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display _U_, char *buf) +absolute_val_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display _U_, char *buf, unsigned int size) { gchar *rep = abs_time_to_str(NULL, &fv->value.time, ABSOLUTE_TIME_LOCAL, rtype == FTREPR_DISPLAY); @@ -347,7 +347,7 @@ absolute_val_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display _U_, char * *buf++ = '\"'; } - strcpy(buf, rep); + g_strlcpy(buf, rep, size); if (rtype == FTREPR_DFILTER) { buf += strlen(rep); @@ -371,11 +371,11 @@ relative_val_repr_len(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_) } static void -relative_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf) +relative_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf, unsigned int size) { gchar *rep; rep = rel_time_to_secs_str(NULL, &fv->value.time); - strcpy(buf, rep); + g_strlcpy(buf, rep, size); wmem_free(NULL, rep); } |