1 files changed, 19 insertions, 19 deletions

diff --git a/xdelta3/xdelta3-second.h b/xdelta3/xdelta3-second.h
index f72ed9b..b9830ab 100644
--- a/xdelta3/xdelta3-second.h
+++ b/xdelta3/xdelta3-second.h
@@ -94,25 +94,27 @@ xd3_test_clean_bits (xd3_stream *stream, bit_state *bits)
 }
 #endif
 
-static xd3_sec_stream*
-xd3_get_secondary (xd3_stream *stream, xd3_sec_stream **sec_streamp)
+static int
+xd3_get_secondary (xd3_stream *stream, xd3_sec_stream **sec_streamp, 
+                   int is_encode)
 {
-  xd3_sec_stream *sec_stream;
-
-  if ((sec_stream = *sec_streamp) == NULL)
+  if (*sec_streamp == NULL)
     {
+      int ret;
+
       if ((*sec_streamp = stream->sec_type->alloc (stream)) == NULL)
         {
-          return NULL;
+          stream->msg = "error initializing secondary stream";
+          return XD3_INVALID;
         }
 
-      sec_stream = *sec_streamp;
-
-      /* If cuumulative stats, init once. */
-      stream->sec_type->init (sec_stream);
+      if ((ret = stream->sec_type->init (stream, *sec_streamp, is_encode)) != 0)
+        {
+          return ret;
+        }
     }
 
-  return sec_stream;
+  return 0;
 }
 
 static int
@@ -120,14 +122,13 @@ xd3_decode_secondary (xd3_stream      *stream,
                       xd3_desect      *sect,
                       xd3_sec_stream **sec_streamp)
 {
-  xd3_sec_stream *sec_stream;
   uint32_t dec_size;
   uint8_t *out_used;
   int ret;
 
-  if ((sec_stream = xd3_get_secondary (stream, sec_streamp)) == NULL)
+  if ((ret = xd3_get_secondary (stream, sec_streamp, 0)) != 0)
     {
-      return ENOMEM;
+      return ret;
     }
 
   /* Decode the size, allocate the buffer. */
@@ -141,7 +142,7 @@ xd3_decode_secondary (xd3_stream      *stream,
 
   out_used = sect->copied2;
 
-  if ((ret = stream->sec_type->decode (stream, sec_stream,
+  if ((ret = stream->sec_type->decode (stream, *sec_streamp,
                                        & sect->buf, sect->buf_max,
                                        & out_used, out_used + dec_size)))
     {
@@ -244,7 +245,6 @@ xd3_encode_secondary (xd3_stream      *stream,
                       xd3_sec_cfg     *cfg,
                       int             *did_it)
 {
-  xd3_sec_stream *sec_stream;
   xd3_output     *tmp_head;
   xd3_output     *tmp_tail;
 
@@ -257,9 +257,9 @@ xd3_encode_secondary (xd3_stream      *stream,
 
   if (orig_size < SECONDARY_MIN_INPUT) { return 0; }
 
-  if ((sec_stream = xd3_get_secondary (stream, sec_streamp)) == NULL)
+  if ((ret = xd3_get_secondary (stream, sec_streamp, 1)) != 0)
     {
-      return ENOMEM;
+      return ret;
     }
 
   tmp_head = xd3_alloc_output (stream, NULL);
@@ -268,7 +268,7 @@ xd3_encode_secondary (xd3_stream      *stream,
    * simpler, but is a little gross.  Should not need the entire
    * section in contiguous memory, but it is much easier this way. */
   if ((ret = xd3_emit_size (stream, & tmp_head, orig_size)) ||
-      (ret = stream->sec_type->encode (stream, sec_stream, *head,
+      (ret = stream->sec_type->encode (stream, *sec_streamp, *head,
                                        tmp_head, cfg)))
     {
       goto getout;