opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bad sanity check in ntfsfix 

Fix misordered checks to avoid potential segfaults on badly damaged partitions.
pull/2/head
Jean-Pierre André 2015-09-30 08:51:20 +02:00
parent 267357899f
commit 4a4ec8c1c6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ntfsprogs/ntfsfix.c
View File

@ -739,13 +739,14 @@ static ATTR_RECORD *find_unnamed_attr(MFT_RECORD *mrec, ATTR_TYPES type)
/* fetch the requested attribute */
offset = le16_to_cpu(mrec->attrs_offset);
a = (ATTR_RECORD*)((char*)mrec + offset);
while ((a->type != AT_END)
&& ((a->type != type) || a->name_length)
&& (offset < le32_to_cpu(mrec->bytes_in_use))) {
while ((offset < le32_to_cpu(mrec->bytes_in_use))
&& (a->type != AT_END)
&& ((a->type != type) || a->name_length)) {
offset += le32_to_cpu(a->length);
a = (ATTR_RECORD*)((char*)mrec + offset);
}
if ((a->type != type)
if ((offset >= le32_to_cpu(mrec->bytes_in_use))
|| (a->type != type)
|| a->name_length)
a = (ATTR_RECORD*)NULL;
return (a);