aboutsummaryrefslogtreecommitdiffstats
path: root/epan/prefs.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2010-01-25 10:22:00 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2010-01-25 10:22:00 +0000
commit17a01968d9904dcf2d4a35568755866cec7224ca (patch)
tree6357cc06e59a7a9cbcc7bd5d2879ef56ae6a0ab0 /epan/prefs.c
parentcbd20099ef8d7906904a4d9dde55f5334b4ce768 (diff)
downloadwireshark-17a01968d9904dcf2d4a35568755866cec7224ca.tar.gz
wireshark-17a01968d9904dcf2d4a35568755866cec7224ca.tar.bz2
wireshark-17a01968d9904dcf2d4a35568755866cec7224ca.zip
Ensure we don't write outside the pref_str in put_string_list().
This bug was introduced in revision 31487, when putting each column.format entry on separate lines. svn path=/trunk/; revision=31653
Diffstat (limited to 'epan/prefs.c')
-rw-r--r--epan/prefs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 1b9788a8a9..d4915950e5 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -934,7 +934,7 @@ put_string_list(GList *sl)
if ((fmt_len + cur_len) < (MAX_FMT_PREF_LEN - 1)) {
if (item_count % 2) {
/* Wrap the line. */
- cur_len--;
+ if (cur_len > 0) cur_len--;
cur_pos = 0;
pref_str[cur_len] = '\n'; cur_len++;
pref_str[cur_len] = '\t'; cur_len++;