use size_t for sizes in TBuffer

Author: jblomer

core/base/inc/TBuffer.h

@@ -47,7 +47,7 @@ class TBuffer : public TObject {
 
    Bool_t           fMode;          //Read or write mode
    Int_t            fVersion;       //Buffer format version
-   Int_t            fBufSize;       //Size of buffer
+   size_t           fBufSize;       //Size of buffer
    char            *fBuffer;        //Buffer used to store objects
    char            *fBufCur;        //Current position in buffer
    char            *fBufMax;        //End of buffer
@@ -87,19 +87,19 @@ class TBuffer : public TObject {
    Bool_t   IsWriting() const { return (fMode & kWrite) != 0; }
    void     SetReadMode();
    void     SetWriteMode();
-   void     SetBuffer(void *buf, UInt_t bufsiz = 0, Bool_t adopt = kTRUE, ReAllocCharFun_t reallocfunc = nullptr);
+   void     SetBuffer(void *buf, size_t bufsiz = 0, Bool_t adopt = kTRUE, ReAllocCharFun_t reallocfunc = nullptr);
    ReAllocCharFun_t GetReAllocFunc() const;
    void     SetReAllocFunc(ReAllocCharFun_t reallocfunc = nullptr);
-   void     SetBufferOffset(Int_t offset = 0) { fBufCur = fBuffer+offset; }
+   void     SetBufferOffset(size_t offset = 0) { fBufCur = fBuffer+offset; }
    void     SetParent(TObject *parent);
    TObject *GetParent()  const;
    char    *Buffer()     const { return fBuffer; }
    char    *GetCurrent() const { return fBufCur; }
-   Int_t    BufferSize() const { return fBufSize; }
+   size_t   BufferSize() const { return fBufSize; }
    void     DetachBuffer() { fBuffer = nullptr; }
-   Int_t    Length()     const { return (Int_t)(fBufCur - fBuffer); }
-   void     Expand(Int_t newsize, Bool_t copy = kTRUE);  // expand buffer to newsize
-   void     AutoExpand(Int_t size_needed);  // expand buffer to newsize
+   size_t   Length()     const { return fBufCur - fBuffer; }
+   void     Expand(size_t newsize, Bool_t copy = kTRUE);  // expand buffer to newsize
+   void     AutoExpand(size_t size_needed);  // expand buffer to newsize
    Bool_t   ByteSwapBuffer(Long64_t n, EDataType type);  // Byte-swap N primitive-elements in the buffer
 
    virtual Bool_t     CheckObject(const TObject *obj) = 0;

core/base/src/TBuffer.cxx

@@ -19,8 +19,7 @@ Buffer base class used for serializing objects.
 #include "TClass.h"
 #include "TProcessID.h"
 
-constexpr Int_t kExtraSpace    = 8;   // extra space at end of buffer (used for free block count)
-constexpr Int_t kMaxBufferSize  = 0x7FFFFFFE;  // largest possible size.
+constexpr size_t kExtraSpace    = 8;   // extra space at end of buffer (used for free block count)
 
 
 ClassImp(TBuffer);
@@ -72,8 +71,6 @@ TBuffer::TBuffer(EMode mode)
 
 TBuffer::TBuffer(EMode mode, Int_t bufsiz)
 {
-   if (bufsiz < 0)
-      Fatal("TBuffer","Request to create a buffer with a negative size, likely due to an integer overflow: 0x%x for a max of 0x%x.", bufsiz, kMaxBufferSize);
    if (bufsiz < kMinimalSize) bufsiz = kMinimalSize;
    fBufSize  = bufsiz;
    fMode     = mode;
@@ -103,8 +100,6 @@ TBuffer::TBuffer(EMode mode, Int_t bufsiz)
 
 TBuffer::TBuffer(EMode mode, Int_t bufsiz, void *buf, Bool_t adopt, ReAllocCharFun_t reallocfunc)
 {
-   if (bufsiz < 0)
-      Fatal("TBuffer","Request to create a buffer with a negative size, likely due to an integer overflow: 0x%x for a max of 0x%x.", bufsiz, kMaxBufferSize);
    fBufSize  = bufsiz;
    fMode     = mode;
    fVersion  = 0;
@@ -115,6 +110,8 @@ TBuffer::TBuffer(EMode mode, Int_t bufsiz, void *buf, Bool_t adopt, ReAllocCharF
    if (buf) {
       fBuffer = (char *)buf;
       if ( (fMode&kWrite)!=0 ) {
+         if (fBufSize <= kExtraSpace)
+            Expand( kMinimalSize );
          fBufSize -= kExtraSpace;
       }
       if (!adopt) ResetBit(kIsOwner);
@@ -128,10 +125,6 @@ TBuffer::TBuffer(EMode mode, Int_t bufsiz, void *buf, Bool_t adopt, ReAllocCharF
    fBufMax = fBuffer + fBufSize;
 
    SetReAllocFunc( reallocfunc );
-
-   if (buf && ( (fMode&kWrite)!=0 ) && fBufSize < 0) {
-      Expand( kMinimalSize );
-   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -155,15 +148,10 @@ TBuffer::~TBuffer()
 /// If the size_needed is larger than the current size, the policy
 /// is to expand to double the current size or the size_needed which ever is largest.
 
-void TBuffer::AutoExpand(Int_t size_needed)
+void TBuffer::AutoExpand(size_t size_needed)
 {
-   if (size_needed < 0) {
-      Fatal("AutoExpand","Request to expand to a negative size, likely due to an integer overflow: 0x%x for a max of 0x%x.", size_needed, kMaxBufferSize);
-   }
    if (size_needed > fBufSize) {
-      Long64_t doubling = 2LLU * fBufSize;
-      if (doubling > kMaxBufferSize)
-         doubling = kMaxBufferSize;
+      size_t doubling = fBufSize * 2;
       if (size_needed > doubling) {
          Expand(size_needed);
       } else {
@@ -184,7 +172,7 @@ void TBuffer::AutoExpand(Int_t size_needed)
 /// is provided, a Fatal error will be issued if the Buffer attempts to
 /// expand.
 
-void TBuffer::SetBuffer(void *buf, UInt_t newsiz, Bool_t adopt, ReAllocCharFun_t reallocfunc)
+void TBuffer::SetBuffer(void *buf, size_t newsiz, Bool_t adopt, ReAllocCharFun_t reallocfunc)
 {
    if (fBuffer && TestBit(kIsOwner))
       delete [] fBuffer;
@@ -198,6 +186,8 @@ void TBuffer::SetBuffer(void *buf, UInt_t newsiz, Bool_t adopt, ReAllocCharFun_t
    fBufCur = fBuffer;
    if (newsiz > 0) {
       if ( (fMode&kWrite)!=0 ) {
+         if (fBufSize <= kExtraSpace)
+            Expand(kMinimalSize);
          fBufSize = newsiz - kExtraSpace;
       } else {
          fBufSize = newsiz;
@@ -206,10 +196,6 @@ void TBuffer::SetBuffer(void *buf, UInt_t newsiz, Bool_t adopt, ReAllocCharFun_t
    fBufMax = fBuffer + fBufSize;
 
    SetReAllocFunc( reallocfunc );
-
-   if (buf && ( (fMode&kWrite)!=0 ) && fBufSize < 0) {
-      Expand( kMinimalSize );
-   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -220,13 +206,12 @@ void TBuffer::SetBuffer(void *buf, UInt_t newsiz, Bool_t adopt, ReAllocCharFun_t
 /// In order to avoid losing data, if the current length is greater than
 /// the requested size, we only shrink down to the current length.
 
-void TBuffer::Expand(Int_t newsize, Bool_t copy)
+void TBuffer::Expand(size_t newsize, Bool_t copy)
 {
-   Int_t l  = Length();
+   size_t l  = Length();
    if ( (l > newsize) && copy ) {
       newsize = l;
    }
-   const Int_t extraspace = (fMode&kWrite)!=0 ? kExtraSpace : 0;
 
    if ( (fMode&kWrite)!=0 ) {
       fBuffer  = fReAllocFunc(fBuffer, newsize+kExtraSpace,

io/io/src/TBufferFile.cxx

@@ -2091,29 +2091,21 @@ void TBufferFile::WriteFastArray(const Short_t *h, Long64_t n)
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Write array of n ints into the I/O buffer.
-/// \note Due to the current limit of the buffer size, the function aborts execution of the program in case of underflow or overflow. See https://github.com/root-project/root/issues/6734 for more details.
 
 void TBufferFile::WriteFastArray(const Int_t *ii, Long64_t n)
 {
    if (n == 0) return;
 
-   constexpr Int_t dataWidth = 4;
-   const Int_t maxElements = (std::numeric_limits<Int_t>::max() - Length())/dataWidth;
-   if (n < 0 || n > maxElements)
-   {
-      Fatal("WriteFastArray", "Not enough space left in the buffer (1GB limit). %lld elements is greater than the max left of %d", n, maxElements);
-      return; // In case the user re-routes the error handler to not die when Fatal is called
-   }
-
-   Int_t l = sizeof(Int_t)*n;
-   if (fBufCur + l > fBufMax) AutoExpand(fBufSize+l);
+   size_t l = sizeof(Int_t) * n;
+   if (fBufCur + l > fBufMax)
+      AutoExpand(fBufSize + l);
 
 #ifdef R__BYTESWAP
 # ifdef USE_BSWAPCPY
    bswapcpy32(fBufCur, ii, n);
    fBufCur += l;
 # else
-   for (int i = 0; i < n; i++)
+   for (size_t i = 0; i < n; i++)
       tobuf(fBufCur, ii[i]);
 # endif
 #else
@@ -3458,7 +3450,8 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, Int_t versio
       sinfo = (TStreamerInfo*)cl->GetConversionStreamerInfo( onFileClass, version );
       if( !sinfo ) {
          Error("ReadClassBuffer",
-               "Could not find the right streamer info to convert %s version %d into a %s, object skipped at offset %d",
+               "Could not find the right streamer info to convert %s version %d into a %s, "
+               "object skipped at offset %zu",
                onFileClass->GetName(), version, cl->GetName(), Length() );
          CheckByteCount(start, count, onFileClass);
          return 0;
@@ -3474,7 +3467,7 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, Int_t versio
       auto infos = cl->GetStreamerInfos();
       auto ninfos = infos->GetSize();
       if (version < -1 || version >= ninfos) {
-         Error("ReadClassBuffer", "class: %s, attempting to access a wrong version: %d, object skipped at offset %d",
+         Error("ReadClassBuffer", "class: %s, attempting to access a wrong version: %d, object skipped at offset %zu",
                cl->GetName(), version, Length() );
          CheckByteCount(start, count, cl);
          return 0;
@@ -3505,7 +3498,8 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, Int_t versio
                CheckByteCount(start, count, cl);
                return 0;
             } else {
-               Error("ReadClassBuffer", "Could not find the StreamerInfo for version %d of the class %s, object skipped at offset %d",
+               Error("ReadClassBuffer", "Could not find the StreamerInfo for version %d of the class %s, "
+                     "object skipped at offset %zu",
                      version, cl->GetName(), Length() );
                CheckByteCount(start, count, cl);
                return 0;
@@ -3567,7 +3561,8 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, const TClass
       sinfo = (TStreamerInfo*)cl->GetConversionStreamerInfo( onFileClass, version );
       if( !sinfo ) {
          Error("ReadClassBuffer",
-               "Could not find the right streamer info to convert %s version %d into a %s, object skipped at offset %d",
+               "Could not find the right streamer info to convert %s version %d into a %s, "
+               "object skipped at offset %zu",
                onFileClass->GetName(), version, cl->GetName(), Length() );
          CheckByteCount(R__s, R__c, onFileClass);
          return 0;
@@ -3591,7 +3586,8 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, const TClass
             Int_t infocapacity = infos->Capacity();
             if (infocapacity) {
                if (version < -1 || version >= infocapacity) {
-                  Error("ReadClassBuffer","class: %s, attempting to access a wrong version: %d, object skipped at offset %d",
+                  Error("ReadClassBuffer","class: %s, attempting to access a wrong version: %d, "
+                        "object skipped at offset %zu",
                         cl->GetName(), version, Length());
                   CheckByteCount(R__s, R__c, cl);
                   return 0;
@@ -3653,7 +3649,8 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, const TClass
                CheckByteCount(R__s, R__c, cl);
                return 0;
             } else {
-               Error( "ReadClassBuffer", "Could not find the StreamerInfo for version %d of the class %s, object skipped at offset %d",
+               Error("ReadClassBuffer", "Could not find the StreamerInfo for version %d of the class %s, "
+                     "object skipped at offset %zu",
                      version, cl->GetName(), Length() );
                CheckByteCount(R__s, R__c, cl);
                return 0;

io/io/src/TStreamerInfoWriteBuffer.cxx

@@ -151,7 +151,7 @@ Int_t TStreamerInfo::WriteBufferAux(TBuffer &b, const T &arr,
             } else {
                if (gDebug > 1) {
                   printf("WriteBuffer, class:%s, name=%s, fType[%d]=%d,"
-                         " %s, bufpos=%d, arr=%p, eoffset=%d, Redirect=%p\n",
+                         " %s, bufpos=%zu, arr=%p, eoffset=%d, Redirect=%p\n",
                          fClass->GetName(), aElement->GetName(), i, compinfo[i]->fType, aElement->ClassName(),
                          b.Length(), arr[0], eoffset, b.PeekDataCache()->GetObjectAt(0));
                }