2 files changed, 7 insertions, 0 deletions

diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index ae0b732..fe4b259 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -79,6 +79,12 @@ gendata_h48(gendata_h48_arg_t *arg)
         h48size = INFOSIZE + H48_TABLESIZE(arg->h, arg->k);
         fallbacksize = arg->k == 2 ? INFOSIZE + H48_TABLESIZE(0, 4) : 0;
         fallback2size = EOESEP_FULLSIZE;
+
+        /* Add padding for 8-bit alignment */
+        h48size = 8 * DIV_ROUND_UP(h48size, 8);
+        fallbacksize = 8 * DIV_ROUND_UP(fallbacksize, 8);
+        fallback2size = 8 * DIV_ROUND_UP(fallback2size, 8);
+
         size = cocsepsize + h48size + fallbacksize + fallback2size;
 
         if (arg->buf == NULL)
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index 9f0cb78..6277082 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -129,6 +129,7 @@ solve_h48_appendallsym(dfsarg_solve_h48_t *arg)
         }
 
         /* The solutions are appended */
+        ret = 0;
         for (k = 0; k < j && *arg->nsols < arg->maxsolutions; k++) {
                 l = arg->solutions_size - *arg->solutions_used;
                 m = *arg->solutions + *arg->solutions_used;