X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=cf8a2c922379b424a3986b6c6871259f7bb6d6b4;hp=efce477e0a122cd076799ea0cb7ad3af67f79eed;hb=7b587995ba7f2fb4e3a8d23f4be0ad91f1ab066a;hpb=c48e2f84645abe34faec4994605d7a7b3b451672

diff --git a/src/extract.c b/src/extract.c
index efce477e..cf8a2c92 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -233,19 +233,18 @@ read_blobs_from_pipe(struct apply_ctx *ctx, const struct read_blob_callbacks *cb
 		if (ret)
 			return ret;
 
-		wim_reshdr_to_desc(&reshdr, ctx->wim, &rdesc);
-
-		if (!(rdesc.flags & WIM_RESHDR_FLAG_METADATA)
+		if (!(reshdr.flags & WIM_RESHDR_FLAG_METADATA)
 		    && (blob = lookup_blob(ctx->wim->blob_table, hash))
 		    && (blob->out_refcnt))
 		{
-			blob_set_is_located_in_nonsolid_wim_resource(blob, &rdesc);
+			wim_reshdr_to_desc_and_blob(&reshdr, ctx->wim, &rdesc, blob);
 			ret = read_blob_with_sha1(blob, cbs);
 			blob_unset_is_located_in_wim_resource(blob);
 			if (ret)
 				return ret;
 			ctx->num_blobs_remaining--;
 		} else {
+			wim_reshdr_to_desc(&reshdr, ctx->wim, &rdesc);
 			ret = skip_wim_resource(&rdesc);
 			if (ret)
 				return ret;
@@ -1158,7 +1157,7 @@ inode_tally_features(const struct wim_inode *inode,
 		else
 			features->other_reparse_points++;
 	}
-	if (inode->i_security_id != -1)
+	if (inode_has_security_descriptor(inode))
 		features->security_descriptors++;
 	if (inode_has_unix_data(inode))
 		features->unix_data++;
@@ -1958,9 +1957,8 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
 		metadata_rdesc = MALLOC(sizeof(struct wim_resource_descriptor));
 		if (!metadata_rdesc)
 			goto out_wimlib_free;
-		wim_reshdr_to_desc(&reshdr, pwm, metadata_rdesc);
-		blob_set_is_located_in_nonsolid_wim_resource(imd->metadata_blob,
-							     metadata_rdesc);
+		wim_reshdr_to_desc_and_blob(&reshdr, pwm, metadata_rdesc,
+					    imd->metadata_blob);
 
 		if (i == image) {
 			/* Metadata resource is for the image being extracted.