Subtract encoding entry size in raw2trace too

DynamoRIO · Nov 22, 2023 · 5a54cb6 · 5a54cb6
1 parent d35869c
commit 5a54cb6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/clients/drcachesim/tracer/raw2trace.cpp b/clients/drcachesim/tracer/raw2trace.cpp
@@ -364,12 +364,12 @@ module_mapper_t::do_encoding_parsing()
     uint64_t cumulative_encoding_length = 0;
     while (map_at < map_end) {
         encoding_entry_t *entry = reinterpret_cast<encoding_entry_t *>(map_at);
-        if (entry->length < sizeof(encoding_entry_t))
+        if (entry->length <= sizeof(encoding_entry_t))
             return "Encoding file is corrupted";
         if (map_at + entry->length > map_end)
             return "Encoding file is truncated";
         cum_block_enc_len_to_encoding_id_[cumulative_encoding_length] = entry->id;
-        cumulative_encoding_length += entry->length;
+        cumulative_encoding_length += (entry->length - sizeof(encoding_entry_t));
         encodings_[entry->id] = entry;
         map_at += entry->length;
     }