[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.146,1.147

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv14563

Modified Files:
	mkntfs.c 
Log Message:
upgrade_to_large_index(): fix double freeing ctx in certain error situation


Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- mkntfs.c	13 Aug 2006 13:46:40 -0000	1.146
+++ mkntfs.c	13 Aug 2006 14:17:02 -0000	1.147
@@ -2424,7 +2424,6 @@ static int upgrade_to_large_index(MFT_RE
 		err = -EINVAL;
 		goto err_out;
 	}
-	ntfs_attr_put_search_ctx(ctx);
 	r = (INDEX_ROOT*)((char*)a + le16_to_cpu(a->value_offset));
 	re_end = (char*)r + le32_to_cpu(a->value_length);
 	re_start = (char*)&r->index + le32_to_cpu(r->index.entries_offset);
@@ -2520,6 +2519,7 @@ static int upgrade_to_large_index(MFT_RE
 		goto err_out;
 	}
 	*idx = ia_val;
+	ntfs_attr_put_search_ctx(ctx);
 	return 0;
 err_out:
 	ntfs_attr_put_search_ctx(ctx);