From 9b2746061848f9a2313c71d10071b348172c0cef Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 12 Dec 2014 08:51:47 -0800
Subject: [PATCH] We always need a page size

---
 src/libsodium/sodium/utils.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c
index 287202a4..399f519e 100644
--- a/src/libsodium/sodium/utils.c
+++ b/src/libsodium/sodium/utils.c
@@ -217,8 +217,13 @@ _sodium_alloc_init(void)
     SYSTEM_INFO si;
     GetSystemInfo(&si);
     page_size = (size_t) si.dwPageSize;
+#else
+    page_size = CANARY_SIZE;
+    if (page_size < sizeof(size_t)) {
+        page_size = sizeof(size_t);
+    }
 #endif
-    if (page_size < CANARY_SIZE) {
+    if (page_size < CANARY_SIZE || page_size < sizeof(size_t)) {
         abort(); /* LCOV_EXCL_LINE */
     }
     randombytes_buf(canary, sizeof canary);