aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor compression handling in close.c to improve buffer management and CRC64 calculation

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-08 19:45:04 +01:00
parent 7529b1f9df
commit 09d58bce8c
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/close.c
View File

@@ -1579,8 +1579,11 @@ static void write_sector_subchannel(const aaruformatContext *ctx)
subchannel_block.compression = None; subchannel_block.compression = None;
uint8_t *buffer = ctx->sector_subchannel; uint8_t *buffer = ctx->sector_subchannel;
bool owns_buffer = false;
uint8_t lzma_properties[LZMA_PROPERTIES_LENGTH] = {0}; uint8_t lzma_properties[LZMA_PROPERTIES_LENGTH] = {0};
subchannel_block.cmpLength = subchannel_block.length;
if(ctx->imageInfo.XmlMediaType == OpticalDisc) if(ctx->imageInfo.XmlMediaType == OpticalDisc)
{ {
subchannel_block.type = CdSectorSubchannel; subchannel_block.type = CdSectorSubchannel;
@@ -1589,8 +1592,7 @@ static void write_sector_subchannel(const aaruformatContext *ctx)
if(ctx->compression_enabled) if(ctx->compression_enabled)
{ {
subchannel_block.compression = LzmaClauniaSubchannelTransform; uint8_t *cst_buffer = malloc(subchannel_block.length);
uint8_t *cst_buffer = malloc(subchannel_block.length);
if(cst_buffer == NULL) if(cst_buffer == NULL)
{ {
@@ -1611,21 +1613,23 @@ static void write_sector_subchannel(const aaruformatContext *ctx)
size_t dst_size = subchannel_block.length; size_t dst_size = subchannel_block.length;
size_t props_size = LZMA_PROPERTIES_LENGTH; size_t props_size = LZMA_PROPERTIES_LENGTH;
aaruf_lzma_encode_buffer(buffer, &dst_size, cst_buffer, subchannel_block.length, lzma_properties, aaruf_lzma_encode_buffer(dst_buffer, &dst_size, cst_buffer, subchannel_block.length, lzma_properties,
&props_size, 9, ctx->lzma_dict_size, 4, 0, 2, 273, 8); &props_size, 9, ctx->lzma_dict_size, 4, 0, 2, 273, 8);
subchannel_block.cmpLength = (uint32_t)dst_size;
free(cst_buffer); free(cst_buffer);
buffer = dst_buffer;
subchannel_block.crc64 = aaruf_crc64_data(buffer, subchannel_block.cmpLength);
if(subchannel_block.cmpLength >= subchannel_block.length) if(dst_size < subchannel_block.length)
{
subchannel_block.compression = LzmaClauniaSubchannelTransform;
subchannel_block.cmpLength = (uint32_t)dst_size;
buffer = dst_buffer;
owns_buffer = true;
}
else
{ {
subchannel_block.compression = None; subchannel_block.compression = None;
subchannel_block.cmpLength = subchannel_block.length;
subchannel_block.cmpCrc64 = subchannel_block.crc64;
free(dst_buffer); free(dst_buffer);
buffer = ctx->sector_subchannel; subchannel_block.cmpLength = subchannel_block.length;
} }
} }
} }
@@ -1664,20 +1668,20 @@ static void write_sector_subchannel(const aaruformatContext *ctx)
size_t dst_size = subchannel_block.length; size_t dst_size = subchannel_block.length;
size_t props_size = LZMA_PROPERTIES_LENGTH; size_t props_size = LZMA_PROPERTIES_LENGTH;
aaruf_lzma_encode_buffer(buffer, &dst_size, ctx->sector_subchannel, subchannel_block.length, lzma_properties, aaruf_lzma_encode_buffer(dst_buffer, &dst_size, ctx->sector_subchannel, subchannel_block.length,
&props_size, 9, ctx->lzma_dict_size, 4, 0, 2, 273, 8); lzma_properties, &props_size, 9, ctx->lzma_dict_size, 4, 0, 2, 273, 8);
subchannel_block.cmpLength = (uint32_t)dst_size; if(dst_size < subchannel_block.length)
buffer = dst_buffer; {
subchannel_block.crc64 = aaruf_crc64_data(buffer, subchannel_block.cmpLength); subchannel_block.cmpLength = (uint32_t)dst_size;
buffer = dst_buffer;
if(subchannel_block.cmpLength >= subchannel_block.length) owns_buffer = true;
}
else
{ {
subchannel_block.compression = None; subchannel_block.compression = None;
subchannel_block.cmpLength = subchannel_block.length;
subchannel_block.cmpCrc64 = subchannel_block.crc64;
free(dst_buffer); free(dst_buffer);
buffer = ctx->sector_subchannel; subchannel_block.cmpLength = subchannel_block.length;
} }
} }
else else
@@ -1686,8 +1690,12 @@ static void write_sector_subchannel(const aaruformatContext *ctx)
return; // Incorrect media type return; // Incorrect media type
} }
// Calculate CRC64 // Calculate CRC64 for raw subchannel data and compressed payload when present
subchannel_block.crc64 = aaruf_crc64_data(ctx->sector_subchannel, subchannel_block.length); subchannel_block.crc64 = aaruf_crc64_data(ctx->sector_subchannel, subchannel_block.length);
if(subchannel_block.compression == None)
subchannel_block.cmpCrc64 = subchannel_block.crc64;
else
subchannel_block.cmpCrc64 = aaruf_crc64_data(buffer, subchannel_block.cmpLength);
// Write header // Write header
if(fwrite(&subchannel_block, sizeof(BlockHeader), 1, ctx->imageStream) == 1) if(fwrite(&subchannel_block, sizeof(BlockHeader), 1, ctx->imageStream) == 1)
@@ -1710,7 +1718,7 @@ static void write_sector_subchannel(const aaruformatContext *ctx)
} }
} }
if(subchannel_block.compression != None) free(buffer); if(owns_buffer) free(buffer);
} }
/** /**