From 5860237d2f05f6ae45a98569b0d567c2227904c6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 5 Mar 2016 20:16:14 +0100 Subject: Fix bugs and add a randomised testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/zor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/zor.c') diff --git a/src/zor.c b/src/zor.c index 240024e..c50f5f8 100644 --- a/src/zor.c +++ b/src/zor.c @@ -20,16 +20,17 @@ zor(z_t a, z_t b, z_t c) m = MAX(b->used, c->used); n = b->used + c->used - m; - a->used = m; ENSURE_SIZE(a, m); if (a == b) { - zmemcpy(a->chars + n, m == b->used ? b->chars : c->chars, m - n); + if (b->used < c->used) + zmemcpy(a->chars + n, c->chars + n, m - n); while (n--) a->chars[n] |= c->chars[n]; } else if (a == c) { - zmemcpy(a->chars + n, m == b->used ? b->chars : c->chars, m - n); + if (c->used < b->used) + zmemcpy(a->chars + n, b->chars + n, m - n); while (n--) a->chars[n] |= b->chars[n]; } else if (m == b->used) { @@ -42,5 +43,6 @@ zor(z_t a, z_t b, z_t c) a->chars[n] |= b->chars[n]; } + a->used = m; SET_SIGNUM(a, (zsignum(b) > 0 && zsignum(c) > 0) * 2 - 1); } -- cgit v1.2.3-70-g09d2