1 files changed, 24 insertions, 5 deletions

diff --git a/src/solvers/twostep/twostep.h b/src/solvers/twostep/twostep.h
index afb49da..e5b00f6 100644
--- a/src/solvers/twostep/twostep.h
+++ b/src/solvers/twostep/twostep.h
@@ -3,6 +3,8 @@
 
 #include "../coord/coord.h"
 
+STATIC size_t twostep_size_1(void);
+STATIC size_t twostep_size_2(void);
 STATIC long long dataid_twostep(const char *, char [SIZE(NISSY_SIZE_DATAID)]);
 STATIC long long gendata_twostep(
     const char *, unsigned long long, unsigned char *);
@@ -13,6 +15,23 @@ STATIC long long solve_twostep(oriented_cube_t, const char *, unsigned,
     const unsigned char *, unsigned, char *,
     long long [SIZE(NISSY_SIZE_SOLVE_STATS)], int (*)(void *), void *);
 
+STATIC size_t
+twostep_size_1(void)
+{
+        size_t s;
+
+        s = gendata_coord(&coordinate_dr, NULL);
+        s = (size_t)8 * DIV_ROUND_UP(s, 8); /* Preserve 8-byte alignment */
+
+        return s;
+}
+
+STATIC size_t
+twostep_size_2(void)
+{
+        return gendata_multicoord(&multicoordinate_drfin, NULL);
+}
+
 STATIC long long
 dataid_twostep(const char *s, char dataid[SIZE(NISSY_SIZE_DATAID)])
 {
@@ -29,9 +48,8 @@ gendata_twostep(
 {
         size_t r, s1, s2;
 
-        s1 = gendata_coord(&coordinate_dr, NULL);
-        s1 = DIV_ROUND_UP(s1, 8); /* Preserve 8-byte alignment */
-        s2 = gendata_multicoord(&multicoordinate_drfin, NULL);
+        s1 = twostep_size_1();
+        s2 = twostep_size_2();
 
         if (buf == NULL)
                 goto gendata_twostep_return_size;
@@ -44,7 +62,7 @@ gendata_twostep(
                 return NISSY_ERROR_UNKNOWN;
 
         r = gendata_multicoord(&multicoordinate_drfin, buf + s1);
-        if (r != NISSY_OK)
+        if (r == 0)
                 return NISSY_ERROR_UNKNOWN;
 
 gendata_twostep_return_size:
@@ -66,7 +84,8 @@ checkdata_twostep(
         if (r != NISSY_OK)
                 return r;
 
-        r = checkdata_multicoord(&multicoordinate_drfin, bufsize, buf);
+        r = checkdata_multicoord(
+            &multicoordinate_drfin, bufsize, buf + twostep_size_1());
         if (r != NISSY_OK)
                 return r;