diff options
| -rw-r--r-- | com32/modules/chain.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/com32/modules/chain.c b/com32/modules/chain.c index 2dd80746..458ea890 100644 --- a/com32/modules/chain.c +++ b/com32/modules/chain.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * * * Copyright 2003-2009 H. Peter Anvin - All Rights Reserved - * Copyright 2009 Intel Corporation; author: H. Peter Anvin + * Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -394,10 +394,13 @@ static struct part_entry *find_logical_partition(int whichpart, char *table, /* Adjust the offset to account for the extended partition itself */ ptab[i].start_lba += self->start_lba; - /* Sanity check entry: must not extend outside the extended partition. - This is necessary since some OSes put crap in some entries. */ - if (ptab[i].start_lba + ptab[i].length <= self->start_lba || - ptab[i].start_lba >= self->start_lba + self->length) + /* + * Sanity check entry: must not extend outside the + * extended partition. This is necessary since some OSes + * put crap in some entries. Note that root is non-NULL here. + */ + if (ptab[i].start_lba + ptab[i].length <= root->start_lba || + ptab[i].start_lba >= root->start_lba + root->length) continue; /* OK, it's a data partition. Is it the one we're looking for? */ |