Changeset 69207 in vbox for trunk/src/bldprogs/scmstream.cpp

Timestamp:

Oct 24, 2017 1:06:06 PM (7 years ago)

Author:

vboxsync

Message:

scm: Relative filtering support. Zero file length allocation workaround.

File:

• trunk/src/bldprogs/scmstream.cpp (modified) (3 diffs)

trunk/src/bldprogs/scmstream.cpp

@@ -93 +93 @@
 
     /* allocate stuff */
-    size_t cbEstimate = pRelatedStream
-                      ? pRelatedStream->cb + pRelatedStream->cb / 10
-                      : _64K;
+    size_t cbEstimate = !pRelatedStream ? _64K
+                      : pRelatedStream->cb > 0 ? pRelatedStream->cb + pRelatedStream->cb / 10 : 64;
     cbEstimate = RT_ALIGN(cbEstimate, _4K);
     pStream->pch = (char *)RTMemAlloc(cbEstimate);
@@ -104 +103 @@
                               : cbEstimate / 24;
         cLinesEstimate = RT_ALIGN(cLinesEstimate, 512);
+        if (cLinesEstimate == 0)
+            cLinesEstimate = 16;
         pStream->paLines = (PSCMSTREAMLINE)RTMemAlloc(cLinesEstimate * sizeof(SCMSTREAMLINE));
         if (pStream->paLines)
@@ -255 +256 @@
         return false;
     if (!pStream->cb)
-        return false;
+        return true;
     return true;
 }