osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From babi: Fix three overflows (bugs 3150 and 3151). 

From me: Use a #define for the RTP analysis field name lengths.

svn path=/trunk/; revision=27064
This commit is contained in:
Gerald Combs 2008-12-20 00:07:21 +00:00
parent 7d22c0fb7f
commit 3bb0df12f5
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/filesystem.c
View File

@ -951,7 +951,7 @@ get_persconffile_dir(const gchar *profilename)
persconffile_profile_dir = g_strdup_printf ("%s%s%s", get_profiles_dir (),
G_DIR_SEPARATOR_S, profilename);
} else {
persconffile_profile_dir = g_strdup (get_persconffile_dir_no_profile ());
persconffile_profile_dir = g_strdup ("%s", get_persconffile_dir_no_profile ());
}
return persconffile_profile_dir;

21
gtk/rtp_analysis.c
View File

@ -2758,13 +2758,14 @@ static void draw_stat(user_data_t *user_data)
/****************************************************************************/
/* append a line to clist */
#define RTP_FIELD_MAX 40
static void add_to_clist(GtkCList *clist, guint32 number, guint16 seq_num,
double delta, double jitter, double bandwidth, gchar *status, gboolean marker,
gchar *timeStr, guint32 pkt_len, GdkColor *bg_color)
{
guint added_row;
gchar *data[9];
gchar field[9][32];
gchar field[9][RTP_FIELD_MAX];
char *savelocale;
GdkColor fg_color = COLOR_FOREGROUND;
@ -2783,15 +2784,15 @@ static void add_to_clist(GtkCList *clist, guint32 number, guint16 seq_num,
/* switch to "C" locale to avoid problems with localized decimal separators
in g_snprintf("%f") functions */
setlocale(LC_NUMERIC, "C");
g_snprintf(field[0], 20, "%u", number);
g_snprintf(field[1], 20, "%u", seq_num);
g_snprintf(field[2], 20, "%.2f", delta);
g_snprintf(field[3], 20, "%.2f", jitter);
g_snprintf(field[4], 20, "%.2f", bandwidth);
g_snprintf(field[5], 20, "%s", marker? "SET" : "");
g_snprintf(field[6], 40, "%s", status);
g_snprintf(field[7], 32, "%s", timeStr);
g_snprintf(field[8], 20, "%u", pkt_len);
g_snprintf(field[0], RTP_FIELD_MAX, "%u", number);
g_snprintf(field[1], RTP_FIELD_MAX, "%u", seq_num);
g_snprintf(field[2], RTP_FIELD_MAX, "%.2f", delta);
g_snprintf(field[3], RTP_FIELD_MAX, "%.2f", jitter);
g_snprintf(field[4], RTP_FIELD_MAX, "%.2f", bandwidth);
g_snprintf(field[5], RTP_FIELD_MAX, "%s", marker? "SET" : "");
g_snprintf(field[6], RTP_FIELD_MAX, "%s", status);
g_snprintf(field[7], RTP_FIELD_MAX, "%s", timeStr);
g_snprintf(field[8], RTP_FIELD_MAX, "%u", pkt_len);
/* restore previous locale setting */
setlocale(LC_NUMERIC, savelocale);

2
wiretap/netscreen.c
View File

@ -335,7 +335,7 @@ parse_netscreen_rec_hdr(wtap *wth, const char *line, char *cap_int, gboolean *ca
int dsec, pkt_len;
char direction[2];
if (sscanf(line, "%d.%d: %[a-z0-9/:.](%[io]) len=%d:",
if (sscanf(line, "%d.%d: %15[a-z0-9/:.](%1[io]) len=%d:",
&sec, &dsec, cap_int, direction, &pkt_len) != 5) {
*err = WTAP_ERR_BAD_RECORD;
*err_info = g_strdup("netscreen: Can't parse packet-header");