Fixes dumb crash in xd3_free_stream when stream->iopt_alloc is NULL.

3 files changed, 14 insertions, 12 deletions

diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index 75c6f91..f1857a9 100755
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -32,6 +32,7 @@ xdelta3_ext = Extension('xdelta3',
                                          ('PYTHON_MODULE',1),
                                          ],
                         extra_compile_args = [ '-O3',
+                                               '-g',
                                                '-funroll-loops',
                                                ])
 
diff --git a/xdelta3/xdelta3-regtest.py b/xdelta3/xdelta3-regtest.py
index bf064bb..8a7e62c 100755
--- a/xdelta3/xdelta3-regtest.py
+++ b/xdelta3/xdelta3-regtest.py
@@ -46,7 +46,7 @@ MAX_RUN        = 1000 * 1000 * 10
 
 #
 #
-RCSDIR = '/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/PRCS/prcs/b'
+RCSDIR = '/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/PRCS'
 
 TMPDIR = '/tmp/xd3regtest.%d' % os.getpid()
 
@@ -578,6 +578,7 @@ def MakeBigFiles(rcsf):
         f1sz += file.AppendVersion(f1, r1)
         f2sz += file.AppendVersion(f2, r2)
 
+    print 'from %u; to %u' % (f1sz, f2sz)
     f1.close()
     f2.close()
     return (TMPDIR + "/big.1",
@@ -588,10 +589,10 @@ def BigFileRun(f1, f2):
     testcases = [
         # large_look large_step small_look small_chain small_lchain
         # ssmatch try_lazy max_lazy long_enough promote
-        ['-DC', '9,7,4,8,1,1,1,16,114,0'],
-        ['-DC', '9,6,4,8,1,1,1,16,114,0'],
-        ['-DC', '9,5,4,8,1,1,1,16,114,0'],
-        ['-DC', '9,4,4,8,1,1,1,16,114,0'],
+        ['-DC', '10,1,5,18,13,1,1,127,83,0'],
+        ['-DC', '10,1,5,18,13,1,1,127,83,1'],
+        ['-DC', '10,1,4,18,13,1,1,127,83,0'],
+        ['-DC', '10,1,4,18,13,1,1,127,83,1'],
     ]
 
     for test in testcases:
@@ -642,7 +643,7 @@ def RandomBigRun(f1, f2):
     strs = [str(x) for x in config]
 
     runner = Xdelta3Pair()
-    runner.extra = ['-DC', ','.join(strs)]
+    runner.extra = ['-I', '0', '-D', '-C', ','.join(strs)]
     result = TimeRun(runner.Runner(f1, 1, f2, 2))
 
     print 'config %s dsize %d time %.7f in %u trials' % \
@@ -664,12 +665,14 @@ def RunSpeed():
 if __name__ == "__main__":
     try:
         os.mkdir(TMPDIR)
-        #rcsf = Test()
+        rcsf = Test()
         #rcsf.PairsByDate(Xdelta3Pair())
         #RunSpeed()
         while 1:
             try:
-                RandomBigRun("/tmp/big.1", "/tmp/big.2")
+                f1, f2 = MakeBigFiles(rcsf)
+                #RandomBigRun("/tmp/big.1", "/tmp/big.2")
+                BigFileRun(f1, f2)
             except CommandError, e:
                 pass
             #end
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 97c3390..4c750ab 100755
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -2283,14 +2283,13 @@ xd3_free_stream (xd3_stream *stream)
 {
   xd3_iopt_buflist *blist = stream->iopt_alloc;
 
-  do
+  while (blist != NULL)
     {
       xd3_iopt_buflist *tmp = blist;
       blist = blist->next;
       xd3_free (stream, tmp->buffer);
       xd3_free (stream, tmp);
     }
-  while (blist != NULL);
 
   xd3_free (stream, stream->large_table);
   xd3_free (stream, stream->small_table);
@@ -3465,7 +3464,6 @@ static int
 xd3_alloc_iopt (xd3_stream *stream, int elts)
 {
   int i;
-  xd3_iopt_buflist* next = stream->iopt_alloc;
   xd3_iopt_buflist* last = xd3_alloc (stream, sizeof (xd3_iopt_buflist), 1);
 
   if (last == NULL ||
@@ -3474,7 +3472,7 @@ xd3_alloc_iopt (xd3_stream *stream, int elts)
       return ENOMEM;
     }
 
-  last->next = next;
+  last->next = stream->iopt_alloc;
   stream->iopt_alloc = last;
 
   for (i = 0; i < elts; i += 1)