Merge pull request #515 from 0xPolygonHermez/fractasy_fix_full_tracer…

…_getFromMemory_length Fix FullTracer::getFromMemory() result length
0xPolygonHermez · Aug 22, 2023 · e092cc4 · e092cc4
2 parents 873bd28 + b16e11b
commit e092cc4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/src/main_sm/fork_1/main/full_tracer.cpp b/src/main_sm/fork_1/main/full_tracer.cpp
@@ -127,6 +127,9 @@ inline void getFromMemory(Context &ctx, mpz_class &offset, mpz_class &length, st
         uint64_t bytesToRetrieve = (end - double(endFloor)) * 32;
         result += hexStringEnd.substr(0, bytesToRetrieve * 2);
     }
+
+    // Limit result memory length in case it is a chunk contained in one single slot
+    result = result.substr(0, length.get_ui()*2);
 }
 
 // Get a global or context variable

diff --git a/src/main_sm/fork_2/main/full_tracer.cpp b/src/main_sm/fork_2/main/full_tracer.cpp
@@ -127,6 +127,9 @@ inline void getFromMemory(Context &ctx, mpz_class &offset, mpz_class &length, st
         uint64_t bytesToRetrieve = (end - double(endFloor)) * 32;
         result += hexStringEnd.substr(0, bytesToRetrieve * 2);
     }
+
+    // Limit result memory length in case it is a chunk contained in one single slot
+    result = result.substr(0, length.get_ui()*2);
 }
 
 // Get a global or context variable

diff --git a/src/main_sm/fork_3/main/full_tracer.cpp b/src/main_sm/fork_3/main/full_tracer.cpp
@@ -127,6 +127,9 @@ inline void getFromMemory(Context &ctx, mpz_class &offset, mpz_class &length, st
         uint64_t bytesToRetrieve = (end - double(endFloor)) * 32;
         result += hexStringEnd.substr(0, bytesToRetrieve * 2);
     }
+
+    // Limit result memory length in case it is a chunk contained in one single slot
+    result = result.substr(0, length.get_ui()*2);
 }
 
 // Get a global or context variable

diff --git a/src/main_sm/fork_4/main/full_tracer.cpp b/src/main_sm/fork_4/main/full_tracer.cpp
@@ -140,6 +140,9 @@ inline zkresult getFromMemory(Context &ctx, mpz_class &offset, mpz_class &length
         result += hexStringEnd.substr(0, bytesToRetrieve * 2);
     }
 
+    // Limit result memory length in case it is a chunk contained in one single slot
+    result = result.substr(0, length.get_ui()*2);
+
     return ZKR_SUCCESS;
 }
 

diff --git a/src/main_sm/fork_5/main/full_tracer.cpp b/src/main_sm/fork_5/main/full_tracer.cpp
@@ -141,6 +141,9 @@ inline zkresult getFromMemory(Context &ctx, mpz_class &offset, mpz_class &length
         result += hexStringEnd.substr(0, bytesToRetrieve * 2);
     }
 
+    // Limit result memory length in case it is a chunk contained in one single slot
+    result = result.substr(0, length.get_ui()*2);
+
     return ZKR_SUCCESS;
 }