Skip to content

Commit

Permalink
fix several bugs in array type handling in dotnet module (#2064)
Browse files Browse the repository at this point in the history
Several bugs were present in the parsing and generation of a string to
represent an array type, notably when the "lo_bound" value is set.

- The "read_blob_signed" was buggy for values outside the
  [-2**6, 2**6-1], the sign edition did not use the right bitmask,
  and the type used was unsigned.

- The display when lo_bound != 0 was buggy:

  - size=5, lobound=0 => should be `5`, this was ok
  - size=5, lobound=1 => should be `1...5`, this was buggy and displayed
    `1...6`. The "range format" is inclusive.

- 0 should still be displayed if size is 0. Only when size is unset
  should it be left out. So an array declared as `[5,0,3]` should be
  displayed the same way, and not as `[5,,3]`.
  • Loading branch information
vthib authored May 2, 2024
1 parent 41aa1e7 commit 2479a71
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions libyara/modules/dotnet/dotnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,10 @@ static int32_t read_blob_signed(const uint8_t** data, uint32_t* len)
{
uint16_t tmp1 = yr_be16toh(yr_unaligned_u16(*data));
// shift and leave top 2 bits clear
uint16_t tmp2 = (tmp1 >> 1) & 0x3FFF;
int16_t tmp2 = (tmp1 >> 1) & 0x3FFF;
// sign extension in case of negative number
if (tmp1 & 0x1)
tmp2 |= 0xC000;
tmp2 |= 0xE000;

*data += sizeof(uint16_t);
*len -= sizeof(uint16_t);
Expand All @@ -602,10 +602,10 @@ static int32_t read_blob_signed(const uint8_t** data, uint32_t* len)
{
uint32_t tmp1 = yr_be32toh(yr_unaligned_u32(*data));
// shift and leave top 3 bits clear
uint32_t tmp2 = (tmp1 >> 1) & 0x1FFFFFFF;
int32_t tmp2 = (tmp1 >> 1) & 0x1FFFFFFF;
// sign extension in case of negative number
if (tmp1 & 0x1)
tmp2 |= 0xE0000000;
tmp2 |= 0xF0000000;

*data += sizeof(uint32_t);
*len -= sizeof(uint32_t);
Expand Down Expand Up @@ -892,13 +892,15 @@ static char* parse_signature_type(

// Read number of specified sizes
uint32_t num_sizes = read_blob_unsigned(data, len);
sizes = yr_malloc(sizeof(uint32_t) * num_sizes);
if (!sizes || num_sizes > rank)
if (num_sizes > rank)
goto cleanup;
sizes = yr_malloc(sizeof(int64_t) * num_sizes);
if (!sizes)
goto cleanup;

for (uint32_t i = 0; i < num_sizes; ++i)
{
sizes[i] = read_blob_unsigned(data, len);
sizes[i] = (int64_t) read_blob_unsigned(data, len);
}

// Read number of specified lower bounds
Expand All @@ -912,8 +914,8 @@ static char* parse_signature_type(
lo_bounds[i] = read_blob_signed(data, len);

// Adjust higher bound according to lower bound
if (num_sizes > i)
sizes[i] += lo_bounds[i];
if (num_sizes > i && lo_bounds[i] != 0)
sizes[i] += lo_bounds[i] - 1;
}

// Build the resulting array type
Expand All @@ -929,7 +931,7 @@ static char* parse_signature_type(
{
if (num_lowbounds > i && lo_bounds[i] != 0)
sstr_appendf(ss, "%d...", lo_bounds[i]);
if (num_sizes > i && sizes[i] != 0)
if (num_sizes > i)
sstr_appendf(ss, "%d", sizes[i]);
}
if (i + 1 != rank)
Expand Down

0 comments on commit 2479a71

Please sign in to comment.