diff options
| author | dim <dim@FreeBSD.org> | 2016-01-19 18:35:22 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-19 18:35:22 +0000 |
| commit | 0458c393d2b4a489b4776083282db929d14e971f (patch) | |
| tree | 147ecfdb39154631092805a1825d4f41301c6046 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | |
| parent | 1a7affd5e6b31797f15eaf1cfe2e3e44e1d609fe (diff) | |
| download | FreeBSD-src-0458c393d2b4a489b4776083282db929d14e971f.zip FreeBSD-src-0458c393d2b4a489b4776083282db929d14e971f.tar.gz | |
MFC r294102:
MFV r294101: 6527 Possible access beyond end of string in zpool comment
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gwr@nexenta.com>
illumos/illumos-gate@2bd7a8d078223b122d65fea49bb8641f858b1409
This fixes erroneous double increments of the 'check' variable in a loop
in spa_prop_validate(). I ran into this in the clang380-import branch,
where clang 3.8.0 warns about it. (It is already fixed there.)
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index fd3e537..ee0b52f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -607,7 +607,6 @@ spa_prop_validate(spa_t *spa, nvlist_t *props) error = SET_ERROR(EINVAL); break; } - check++; } if (strlen(strval) > ZPROP_MAX_COMMENT) error = E2BIG; |
