Fix error with GalleyVector: if blob has less data then we expect for variated stamp, but still enough we should properly use it

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit 5224579d9cc4 · 2023-10-24T21:08:21.000+03:00
diff --git a/blobstamper/galley.cpp b/blobstamper/galley.cpp
@@ -171,9 +171,10 @@ fprintf(stderr, "fixed = %i, var_size = %i\n", fixed_size, var_size);
 
         ORACLE_TYPE oracle = stamp_oracle.ExtractValue(blob);
 
-        int size = (double) oracle / ORACLE_MAX * (var_size + 1); /* +1 -- это грубая эмуляция округления вверх. oracle == ORACLE_MAX-1 == 65534 должен дать count_max*/
-        if (size > var_size) size = var_size; // In case we've hit oracle == ORACLE_MAX boundary
-        size += fixed_size;
+        int size = OracleProportion(oracle, stamp->minSize(), stamp->maxSize());
+        if (size > blob->Size())
+          size = blob->Size();  // Getting what have been left, if not as much as we wanted
+
 fprintf(stderr,"---- %i %i\n", size, blob->Size());
         std::shared_ptr<Blob> blob2 = blob->Chop(size);
         res.push_back(blob2);
