7 files changed, 41 insertions, 83 deletions

diff --git a/xdelta1/libedsio/default.c b/xdelta1/libedsio/default.c
index 8c9f347..0da2176 100755
--- a/xdelta1/libedsio/default.c
+++ b/xdelta1/libedsio/default.c
@@ -18,6 +18,7 @@ sink_type_default (SerialSink* sink, SerialType type, guint32 len, gboolean set_
   if (! sink->next_uint32 (sink, type))
     return FALSE;
 
+  /* Note: set_allocation is deprecated in 1.1.4 */
   if (set_allocation && !sink->next_uint32 (sink, len))
     return FALSE;
 
@@ -146,7 +147,9 @@ source_type_default (SerialSource* source, gboolean set_allocation)
 
   if (set_allocation)
     {
-      if (! source->next_uint32 (source, &source->alloc_total))
+      /* Note: set_allocation is deprecated in 1.1.4 */
+      guint32 bogus;
+      if (! source->next_uint32 (source, &bogus))
         return ST_Error;
     }
 
@@ -283,66 +286,27 @@ source_next_bytes_known (SerialSource* source, guint8 *ptr, guint32 len)
 void*
 serializeio_source_alloc (SerialSource* source, guint32 len)
 {
+  AllocList *al;
   void* ret;
 
-  if (! source->alloc_buf)
+  if (source->salloc_func)
     {
-      if (source->salloc_func)
-        source->alloc_buf_orig = source->salloc_func (source, source->alloc_total + 8);
-      else
-        source->alloc_buf_orig = g_malloc0 (source->alloc_total + 8);
-
-      source->alloc_buf = source->alloc_buf_orig;
-
-          { long x = source->alloc_buf; ALIGN_8 (x); source->alloc_buf = x; }
-
+      ret = source->salloc_func (source, len);
+      al = source->salloc_func (source, sizeof(AllocList));
     }
-
-  if (len+source->alloc_pos > source->alloc_total)
+  else
     {
-      edsio_generate_source_event (EC_EdsioIncorrectAllocation, source);
-      return NULL;
+      ret = g_malloc0 (len);
+      al = g_malloc0 (sizeof(AllocList));
     }
 
-  ret = ((guint8*)source->alloc_buf) + source->alloc_pos;
-
-  source->alloc_pos += len;
-
-  ALIGN_8 (source->alloc_pos);
-
-  g_assert (((long)ret) % 8 == 0);
-  g_assert (source->alloc_pos % 8 == 0);
+  al->ptr = ret;
+  al->next = source->alloc_list;
+  source->alloc_list = al;
 
   return ret;
 }
 
-gboolean
-serializeio_source_object_received (SerialSource* source)
-{
-  source->alloc_pos = 0;
-  source->alloc_total = 0;
-  source->alloc_buf_orig = NULL;
-  source->alloc_buf = NULL;
-
-  return TRUE;
-}
-
-void
-serializeio_source_reset_allocation (SerialSource* source)
-{
-  source->alloc_pos = 0;
-  source->alloc_total = 0;
-  source->alloc_buf = NULL;
-
-  if (source->alloc_buf_orig)
-    {
-      if (source->sfree_func)
-        source->sfree_func (source, source->alloc_buf_orig);
-      else
-        g_free (source->alloc_buf_orig);
-    }
-}
-
 void
 serializeio_source_init (SerialSource* it,
                          SerialType (* source_type) (SerialSource* source,
@@ -357,6 +321,7 @@ serializeio_source_init (SerialSource* it,
                          void       (* sfree_func) (SerialSource* source,
                                                     void*         ptr))
 {
+  it->alloc_list = NULL;
   it->next_bytes_known = source_next_bytes_known;
   it->next_bytes = source_next_bytes;
   it->next_uint = source_next_uint;
diff --git a/xdelta1/libedsio/edsio.el b/xdelta1/libedsio/edsio.el
index b28f623..d8cd91e 100755
--- a/xdelta1/libedsio/edsio.el
+++ b/xdelta1/libedsio/edsio.el
@@ -869,8 +869,6 @@ replacement is as for replace-regexp."
 
     (insert (format "  if (! unserialize_%s_internal (source, result)) goto bail;\n" ent-downcase))
 
-    (insert (format "  if (! serializeio_source_object_received (source)) goto bail;\n"))
-
     (insert (format "  return TRUE;\n"))
     (insert (format "bail:\n"))
     (insert (format "  return FALSE;\n"))
diff --git a/xdelta1/libedsio/edsio.h b/xdelta1/libedsio/edsio.h
index 06b5647..98f899e 100755
--- a/xdelta1/libedsio/edsio.h
+++ b/xdelta1/libedsio/edsio.h
@@ -28,6 +28,7 @@ typedef gint32                  SerialType;
 typedef struct _HandleFuncTable HandleFuncTable;
 typedef struct _PropTest        PropTest;
 typedef struct _FileHandle      FileHandle;
+typedef struct _AllocList       AllocList;
 
 struct _FileHandle {
   const HandleFuncTable* table;
@@ -49,7 +50,6 @@ struct _FileHandle {
 #define ALIGN_8(v) if (((v) % 8) != 0) { (v) += 8; (v) &= ~7; }
 
 /* This serves as a virtual table for I/O to the FileHandle */
-
 struct _HandleFuncTable
 {
   gssize            (* table_handle_length)       (FileHandle *fh);
@@ -67,12 +67,14 @@ struct _HandleFuncTable
   const gchar*      (* table_handle_name)         (FileHandle *fh); /* user must free */
 };
 
+struct _AllocList {
+  AllocList *next;
+  void *ptr;
+};
+  
 struct _SerialSource {
   /* Internal variables: don't touch. */
-  guint32  alloc_total;
-  guint32  alloc_pos;
-  void    *alloc_buf;
-  void    *alloc_buf_orig;
+  AllocList *alloc_list;
 
   /* These are setup by init.
    */
@@ -187,8 +189,7 @@ void           serializeio_source_init                    (SerialSource* source,
                                                            void       (* sfree_func) (SerialSource* source,
                                                                                       void*         ptr));
 
-/* These two functions are internal, don't use. */
-gboolean       serializeio_source_object_received         (SerialSource* source);
+/* This function is internal, don't use. */
 void*          serializeio_source_alloc                   (SerialSource* source,
                                                            guint32       len);
 
diff --git a/xdelta1/libedsio/fh.c b/xdelta1/libedsio/fh.c
index e93dd77..6b27cbf 100755
--- a/xdelta1/libedsio/fh.c
+++ b/xdelta1/libedsio/fh.c
@@ -90,7 +90,9 @@ handle_source_type (SerialSource* source, gboolean set_allocation)
 
   if (set_allocation)
     {
-      if (! ssource->fh->table->table_handle_getui (ssource->fh, &source->alloc_total))
+      /* Note: set_allocation is deprecated in 1.1.4 */
+      guint32 bogus;
+      if (! ssource->fh->table->table_handle_getui (ssource->fh, &bogus))
         return ST_Error;
     }
 
@@ -127,6 +129,7 @@ handle_sink_type (SerialSink* sink, SerialType type, guint len, gboolean set_all
   if (! ssink->fh->table->table_handle_putui (ssink->fh, type))
     return FALSE;
 
+  /* Note: set_allocation is deprecated in 1.1.4 */
   if (set_allocation && ! ssink->fh->table->table_handle_putui (ssink->fh, len))
     return FALSE;
 
diff --git a/xdelta1/libedsio/generic.c b/xdelta1/libedsio/generic.c
index fb96e9a..96d246a 100755
--- a/xdelta1/libedsio/generic.c
+++ b/xdelta1/libedsio/generic.c
@@ -24,8 +24,6 @@ typedef struct {
 static GArray   *ser_array;
 static gboolean  ser_array_sorted;
 
-void serializeio_source_reset_allocation (SerialSource* source);
-
 void
 serializeio_initialize_type (const char* name,
                              guint32    val,
@@ -127,17 +125,8 @@ serializeio_unserialize_generic_internal (SerialSource *source,
   if (ent)
     {
       res = ent->unserialize_func (source, object);
-
-      if (set_allocation && res)
-        {
-          if (! serializeio_source_object_received (source))
-            return FALSE;
-        }
     }
 
-  if (set_allocation)
-    serializeio_source_reset_allocation (source);
-
   return res;
 }
 
diff --git a/xdelta1/xdelta.c b/xdelta1/xdelta.c
index 3012afc..ff9b934 100755
--- a/xdelta1/xdelta.c
+++ b/xdelta1/xdelta.c
@@ -316,6 +316,8 @@ xdp_source_index_read (XdeltaSource    *xs,
   if (! ss)
     return FALSE;
 
+  /* TODO: free ss */
+
   if (! unserialize_xdeltaindex (ss, &index))
     return FALSE;
 
@@ -325,8 +327,6 @@ xdp_source_index_read (XdeltaSource    *xs,
   xs->ck_count = index->index_len;
   xs->cksums = index->index;
 
-  /* @@@ how to free this? */
-
   return TRUE;
 }
 
@@ -1419,6 +1419,8 @@ xdp_control_read (XdeltaStream    *cont_in)
   if (! src)
     return NULL;
 
+  /* TODO: free src */
+
   if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void**) & cont))
     return NULL;
 
diff --git a/xdelta1/xdelta.prj b/xdelta1/xdelta.prj
index ff7eee9..cc4b6bb 100755
--- a/xdelta1/xdelta.prj
+++ b/xdelta1/xdelta.prj
@@ -1,11 +1,11 @@
 ;; -*- PRCS -*-
 (Created-By-Prcs-Version 1 3 4)
 (Project-Description "")
-(Project-Version xdelta 1.1-maint 14)
-(Parent-Version xdelta 1.1-maint 13)
-(Version-Log "")
+(Project-Version xdelta 1.1-maint 15)
+(Parent-Version xdelta 1.1-maint 14)
+(Version-Log "fixed the source allocation problem, free() was never being called and still isn't, added 2 TODOs for freeing source/control handles")
 (New-Version-Log "")
-(Checkin-Time "Sun, 28 Jan 2007 11:23:01 -0800")
+(Checkin-Time "Sun, 28 Jan 2007 12:21:11 -0800")
 (Checkin-Login jmacd)
 (Populate-Ignore ("\\.o$"
                   "\\.deps"
@@ -60,7 +60,7 @@
   ;; Library
   (xdelta.h (xdelta/b/8_xdelta.h 1.4.1.8.1.50.1.3 744))
   (xdeltapriv.h (xdelta/c/42_xdeltapriv 1.29 744))
-  (xdelta.c (xdelta/b/14_xdelta.c 1.4.1.50.1.3 744))
+  (xdelta.c (xdelta/b/14_xdelta.c 1.4.1.50.1.4 744))
   (xd.ser (xdelta/d/7_xd.ser 1.12 744))
   (xdrsync.c (xdelta/d/44_xdrsync.c 1.2 744))
   (xdapply.c (xdelta/e/37_xdapply.c 1.1 744))
@@ -98,19 +98,19 @@
   ;; Files added by populate at Sun, 28 Jan 2007 10:01:31 -0800,
   ;; to version 1.1-maint.12(w), by jmacd:
 
-  (libedsio/fh.c (xdelta/i/9_fh.c 1.1 744))
+  (libedsio/fh.c (xdelta/i/9_fh.c 1.2 744))
   (libedsio/maketime.c (xdelta/i/10_maketime.c 1.1 744))
   (libedsio/simple.c (xdelta/i/11_simple.c 1.1 744))
   (libedsio/md5c.c (xdelta/i/12_md5c.c 1.1 744))
   (libedsio/Makefile.am (xdelta/i/13_Makefile.a 1.1 744))
   (libedsio/base64.c (xdelta/i/15_base64.c 1.1 744))
-  (libedsio/default.c (xdelta/i/16_default.c 1.1 744))
-  (libedsio/edsio.el (xdelta/i/18_edsio.el 1.1 744))
+  (libedsio/default.c (xdelta/i/16_default.c 1.2 744))
+  (libedsio/edsio.el (xdelta/i/18_edsio.el 1.2 744))
   (libedsio/edsio-comp (xdelta/i/19_edsio-comp 1.1 744))
-  (libedsio/generic.c (xdelta/i/20_generic.c 1.1 744))
+  (libedsio/generic.c (xdelta/i/20_generic.c 1.2 744))
   (libedsio/sha.c (xdelta/i/21_sha.c 1.1 744))
   (libedsio/edsio.ser (xdelta/i/22_edsio.ser 1.1 744))
-  (libedsio/edsio.h (xdelta/i/23_edsio.h 1.1 744))
+  (libedsio/edsio.h (xdelta/i/23_edsio.h 1.2 744))
   (libedsio/partime.h (xdelta/i/24_partime.h 1.1 744))
   (libedsio/library.c (xdelta/i/25_library.c 1.1 744))
   (libedsio/edsio.c (xdelta/i/26_edsio.c 1.1 744))