Implement binary representation of PATH and add tests for it

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit c1d23016ebeb · 2021-08-07T20:04:04.000+03:00
diff --git a/blobstamper/helpers.h b/blobstamper/helpers.h
@@ -95,24 +95,28 @@ template<class T, class ArrayT> class VLATO_ptr
   private:
     T* _ptr{nullptr};
     size_t _length;
+    size_t _offset;
   public:
 
     operator T*() const {return _ptr;};
     operator sized_ptr<T>() {sized_ptr<T> res(_ptr,size()); _ptr=NULL; return res;};
 
     size_t length() {return _length;};
-    size_t size()   {return sizeof(T) + _length * sizeof(ArrayT);};
-    VLATO_ptr(size_t length);
-    VLATO_ptr(T* ptr, size_t length): _ptr{ptr}, _length{length} {};
+    size_t offset() {return _offset;};
+    size_t size()   {return _offset + _length * sizeof(ArrayT);};
+
+    VLATO_ptr(size_t offsrt, size_t length);
+    VLATO_ptr(T* ptr, size_t offset, size_t length): _ptr{ptr}, _offset{offset}, _length{length} {};
     ~VLATO_ptr() {if (_ptr) free(_ptr);}
 };
 
 
 template<class T, class ArrayT>
-VLATO_ptr<T,ArrayT>::VLATO_ptr(size_t length)
+VLATO_ptr<T,ArrayT>::VLATO_ptr(size_t offset, size_t length)
 {
-  _ptr = (T*) malloc(sizeof(T) + sizeof(ArrayT) * length);
+  _ptr = (T*) malloc( offset + sizeof(ArrayT) * length);
   _length = length;
+  _offset = offset;
 }
 
 
diff --git a/t/050-sized_prt_and_vsato_ptr.cpp b/t/050-sized_prt_and_vsato_ptr.cpp
@@ -27,7 +27,7 @@ typedef struct
 
 
 int main() {
-    TEST_START(10);
+    TEST_START(9);
 
     // #tests for sized_ptr
     { /* 1..3 */
@@ -45,17 +45,16 @@ int main() {
 //      free(l); /*Do not need to free it. sized_ptr will do it for you*/
     }
     { /* 4..10 */
-       is(sizeof(FixedLengthObject), sizeof(VariableLengthObject), "sizes sainity check VLATO_prt expects this to be true");
-       VLATO_ptr<VariableLengthObject, short int> vp(5);
+       VLATO_ptr<VariableLengthObject, short int> vp(offsetof(VariableLengthObject,arr), 5);
        is(vp.length(), 5, "Number of elements is ok");
-       is(vp.size(), sizeof(VariableLengthObject) + sizeof(short int) *5, "Size of object is ok");
+       is(vp.size(), offsetof(VariableLengthObject,arr) + sizeof(short int) *5, "Size of object is ok");
        VariableLengthObject *p1 = vp;
        p1->arr[4]=100;
 
        sized_ptr<VariableLengthObject> sp = vp; // from now on vp does not exit
        VariableLengthObject *p2 = vp;
        ok(!p2, "now vp should not point anywere");
-       is(sp.size(), sizeof(VariableLengthObject) + sizeof(short int) *5, "Size of sized object is ok");
+       is(sp.size(), offsetof(VariableLengthObject,arr) + sizeof(short int) *5, "Size of sized object is ok");
 
        VariableLengthObject *p3 = sp;
        ok(p1 == p3, "Still same object");
