[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] sys-file-reader: Elevate invalid number of labels from warni
From: |
Ben Pfaff |
Subject: |
[PATCH 8/9] sys-file-reader: Elevate invalid number of labels from warning to error. |
Date: |
Sun, 30 Jan 2011 20:37:39 -0800 |
There's no way to figure out when the labels end when the count is wrong,
so this has to be an error.
---
src/data/sys-file-reader.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index f0568ee..f5b6aaf 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -1406,11 +1406,7 @@ read_value_labels (struct sfm_reader *r,
label_cnt = read_int (r);
if (size_overflow_p (xtimes (label_cnt, sizeof *labels)))
- {
- sys_warn (r, _("Invalid number of labels: %d. Ignoring labels."),
- label_cnt);
- label_cnt = 0;
- }
+ sys_error (r, _("Invalid number of labels %d."), label_cnt);
/* Read each value/label tuple into labels[]. */
labels = pool_nalloc (subpool, label_cnt, sizeof *labels);
--
1.7.1
- [PATCH 0/9] sys-file-reader fixes and tests, Ben Pfaff, 2011/01/30
- [PATCH 3/9] sys-file-reader: Check that multiple response set names begin with `$'., Ben Pfaff, 2011/01/30
- [PATCH 2/9] sys-file-reader: Fix double-free on read of partial record., Ben Pfaff, 2011/01/30
- [PATCH 7/9] sys-file-reader: Avoid redundant "within system file" in messages., Ben Pfaff, 2011/01/30
- [PATCH 4/9] sys-file-reader: Add missing periods at end of error messages., Ben Pfaff, 2011/01/30
- [PATCH 6/9] sys-file-reader: Improve debugging usefulness of error messages., Ben Pfaff, 2011/01/30
- [PATCH 1/9] hash-functions: Use C instead of preprocessor to test size of double., Ben Pfaff, 2011/01/30
- [PATCH 5/9] sys-file-reader: Really enable warnings for invalid variable formats., Ben Pfaff, 2011/01/30
- [PATCH 8/9] sys-file-reader: Elevate invalid number of labels from warning to error.,
Ben Pfaff <=
- [PATCH 9/9] sys-file-reader: Add tests., Ben Pfaff, 2011/01/30