X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fblob_table.c;h=08859c42787baa5147a398bdacdecae579f69275;hb=593660b74e10631a4e1acca5ea684e4a55e84682;hp=39dc865bf048c6e6e7fbde2789be29f4dcc32ba1;hpb=1d898377d67701075d0b9e6d7f8541aad21599a4;p=wimlib

diff --git a/src/blob_table.c b/src/blob_table.c
index 39dc865b..08859c42 100644
--- a/src/blob_table.c
+++ b/src/blob_table.c
@@ -138,18 +138,9 @@ clone_blob_descriptor(const struct blob_descriptor *old)
 		break;
 #ifdef WITH_NTFS_3G
 	case BLOB_IN_NTFS_VOLUME:
-		if (old->ntfs_loc) {
-			new->ntfs_loc = memdup(old->ntfs_loc,
-					       sizeof(struct ntfs_location));
-			if (new->ntfs_loc == NULL)
-				goto out_free;
-			if (new->ntfs_loc->attr_name != NULL) {
-				new->ntfs_loc->attr_name =
-					utf16le_dup(new->ntfs_loc->attr_name);
-				if (new->ntfs_loc->attr_name == NULL)
-					goto out_free;
-			}
-		}
+		new->ntfs_loc = clone_ntfs_location(old->ntfs_loc);
+		if (!new->ntfs_loc)
+			goto out_free;
 		break;
 #endif
 	}
@@ -186,14 +177,10 @@ blob_release_location(struct blob_descriptor *blob)
 		break;
 #ifdef WITH_NTFS_3G
 	case BLOB_IN_NTFS_VOLUME:
-		if (blob->ntfs_loc) {
-			FREE(blob->ntfs_loc->attr_name);
-			FREE(blob->ntfs_loc);
-		}
+		if (blob->ntfs_loc)
+			free_ntfs_location(blob->ntfs_loc);
 		break;
 #endif
-	default:
-		break;
 	}
 }
 
@@ -408,7 +395,7 @@ cmp_blobs_by_sequential_order(const void *p1, const void *p2)
 
 	v = (int)blob1->blob_location - (int)blob2->blob_location;
 
-	/* Different resource locations?  */
+	/* Different locations?  */
 	if (v)
 		return v;
 
@@ -442,13 +429,17 @@ cmp_blobs_by_sequential_order(const void *p1, const void *p2)
 #ifdef __WIN32__
 	case BLOB_IN_WINNT_FILE_ON_DISK:
 	case BLOB_WIN32_ENCRYPTED:
+		/* Windows: compare by starting LCN (logical cluster number)  */
+		v = cmp_u64(blob1->sort_key, blob2->sort_key);
+		if (v)
+			return v;
 #endif
 		/* Compare files by path: just a heuristic that will place files
 		 * in the same directory next to each other.  */
 		return tstrcmp(blob1->file_on_disk, blob2->file_on_disk);
 #ifdef WITH_NTFS_3G
 	case BLOB_IN_NTFS_VOLUME:
-		return cmp_u64(blob1->ntfs_loc->mft_no, blob2->ntfs_loc->mft_no);
+		return cmp_ntfs_locations(blob1->ntfs_loc, blob2->ntfs_loc);
 #endif
 	default:
 		/* No additional sorting order defined for this resource
@@ -1031,6 +1022,13 @@ read_blob_table(WIMStruct *wim)
 				goto out;
 			}
 
+			if (reshdr.flags & WIM_RESHDR_FLAG_SOLID) {
+				ERROR("Image metadata in solid resources "
+				      "is unsupported.");
+				ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
+				goto out;
+			}
+
 			if (wim->hdr.part_number != 1) {
 				WARNING("Ignoring metadata resource found in a "
 					"non-first part of the split WIM");