From 3be359813c8114a6ad40c473138324c3c9733278 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 31 Jan 2012 15:03:27 +0100 Subject: libblkid: more robust idx usage [coverity scan] Signed-off-by: Karel Zak --- libblkid/src/superblocks/superblocks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libblkid') diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c index e465eb154..d985adc05 100644 --- a/libblkid/src/superblocks/superblocks.c +++ b/libblkid/src/superblocks/superblocks.c @@ -440,10 +440,12 @@ static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn) count++; - if (idinfos[chn->idx]->usage & (BLKID_USAGE_RAID | BLKID_USAGE_CRYPTO)) + if (chn->idx >= 0 && + idinfos[chn->idx]->usage & (BLKID_USAGE_RAID | BLKID_USAGE_CRYPTO)) break; - if (!(idinfos[chn->idx]->flags & BLKID_IDINFO_TOLERANT)) + if (chn->idx >= 0 && + !(idinfos[chn->idx]->flags & BLKID_IDINFO_TOLERANT)) intol++; if (count == 1) { -- cgit v1.2.3-55-g7522