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/zxor.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/zxor.c') diff --git a/src/zxor.c b/src/zxor.c index fcbb3ae..d152ed7 100644 --- a/src/zxor.c +++ b/src/zxor.c @@ -21,19 +21,16 @@ zxor(z_t a, z_t b, z_t c) m = MAX(b->used, c->used); n = b->used + c->used - m; - if (n == m && !zmemcmp(b->chars, c->chars, m)) { - SET_SIGNUM(a, 0); - return; - } - 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) { @@ -46,5 +43,11 @@ zxor(z_t a, z_t b, z_t c) a->chars[n] ^= b->chars[n]; } - SET_SIGNUM(a, 1 - 2 * ((zsignum(b) ^ zsignum(c)) < 0)); + a->used = m; + while (a->used && !a->chars[a->used - 1]) + a->used--; + if (a->used) + SET_SIGNUM(a, 1 - 2 * ((zsignum(b) ^ zsignum(c)) < 0)); + else + SET_SIGNUM(a, 0); } -- cgit v1.2.3-70-g09d2