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

[tool] Reset error code before string conversion in metadata processing

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-01 03:28:47 +01:00
parent 194a220527
commit ff1e949346
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tool/info.c
View File

@@ -20,6 +20,7 @@
#include <errno.h> #include <errno.h>
#include <locale.h> #include <locale.h>
#include <unicode/ucnv.h> #include <unicode/ucnv.h>
#include <unicode/ustring.h>
#include <aaruformat.h> #include <aaruformat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -30,10 +31,11 @@ int info(char *path)
{ {
aaruformatContext *ctx; aaruformatContext *ctx;
char *strBuffer; char *strBuffer;
UErrorCode u_error_code; UErrorCode u_error_code = U_ZERO_ERROR;
uint i, j; uint i, j;
mediaTagEntry *mediaTag; mediaTagEntry *mediaTag;
mediaTagEntry *tmpMediaTag; mediaTagEntry *tmpMediaTag;
UChar ustr[128];
ctx = aaruf_open(path); ctx = aaruf_open(path);
@@ -101,6 +103,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.creatorLength > 0) if(ctx->metadataBlockHeader.creatorLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.creatorLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.creatorLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.creatorLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.creatorLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.creatorLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.creatorLength,
@@ -112,6 +115,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.commentsLength > 0) if(ctx->metadataBlockHeader.commentsLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.commentsLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.commentsLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.commentsLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.commentsLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.commentsLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.commentsLength,
@@ -123,6 +127,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.mediaTitleLength > 0) if(ctx->metadataBlockHeader.mediaTitleLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.mediaTitleLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.mediaTitleLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.mediaTitleLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.mediaTitleLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaTitleLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaTitleLength,
@@ -134,6 +139,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.mediaManufacturerLength > 0) if(ctx->metadataBlockHeader.mediaManufacturerLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.mediaManufacturerLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.mediaManufacturerLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.mediaManufacturerLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.mediaManufacturerLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaManufacturerLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaManufacturerLength,
@@ -145,6 +151,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.mediaModelLength > 0) if(ctx->metadataBlockHeader.mediaModelLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.mediaModelLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.mediaModelLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.mediaModelLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.mediaModelLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaModelLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaModelLength,
@@ -156,6 +163,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.mediaSerialNumberLength > 0) if(ctx->metadataBlockHeader.mediaSerialNumberLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.mediaSerialNumberLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.mediaSerialNumberLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.mediaSerialNumberLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.mediaSerialNumberLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaSerialNumberLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaSerialNumberLength,
@@ -167,6 +175,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.mediaBarcodeLength > 0) if(ctx->metadataBlockHeader.mediaBarcodeLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.mediaBarcodeLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.mediaBarcodeLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.mediaBarcodeLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.mediaBarcodeLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaBarcodeLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaBarcodeLength,
@@ -178,6 +187,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.mediaPartNumberLength > 0) if(ctx->metadataBlockHeader.mediaPartNumberLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.mediaPartNumberLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.mediaPartNumberLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.mediaPartNumberLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.mediaPartNumberLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaPartNumberLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.mediaPartNumberLength,
@@ -189,6 +199,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.driveManufacturerLength > 0) if(ctx->metadataBlockHeader.driveManufacturerLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.driveManufacturerLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.driveManufacturerLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.driveManufacturerLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.driveManufacturerLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveManufacturerLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveManufacturerLength,
@@ -200,6 +211,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.driveModelLength > 0) if(ctx->metadataBlockHeader.driveModelLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.driveModelLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.driveModelLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.driveModelLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.driveModelLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveModelLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveModelLength,
@@ -211,6 +223,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.driveSerialNumberLength > 0) if(ctx->metadataBlockHeader.driveSerialNumberLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.driveSerialNumberLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.driveSerialNumberLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.driveSerialNumberLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.driveSerialNumberLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveSerialNumberLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveSerialNumberLength,
@@ -222,6 +235,7 @@ int info(char *path)
if(ctx->metadataBlockHeader.driveFirmwareRevisionLength > 0) if(ctx->metadataBlockHeader.driveFirmwareRevisionLength > 0)
{ {
u_error_code = U_ZERO_ERROR; // Reset error code before conversion
strBuffer = malloc(ctx->metadataBlockHeader.driveFirmwareRevisionLength + 1); strBuffer = malloc(ctx->metadataBlockHeader.driveFirmwareRevisionLength + 1);
memset(strBuffer, 0, ctx->metadataBlockHeader.driveFirmwareRevisionLength + 1); memset(strBuffer, 0, ctx->metadataBlockHeader.driveFirmwareRevisionLength + 1);
ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveFirmwareRevisionLength, ucnv_convert(NULL, "UTF-16LE", strBuffer, (int)ctx->metadataBlockHeader.driveFirmwareRevisionLength,