Fixes the source-allocation problem, should resolve 64bit platform

issues.

1 files changed, 15 insertions, 50 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;