From f3acfea81565edf38ca7546fe4a351126d04442a Mon Sep 17 00:00:00 2001
From: Craig Barnes <craigbarnes@protonmail.com>
Date: Tue, 25 Aug 2020 19:39:17 +0100
Subject: [PATCH] fix some buggy comparisons relating to signed/unsigned types

---
 config.c | 2 +-
 shm.c    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config.c b/config.c
index a850b617..8a7a3476 100644
--- a/config.c
+++ b/config.c
@@ -427,7 +427,7 @@ parse_section_scrollback(const char *key, const char *value, struct config *conf
             conf->scrollback.indicator.text = NULL;
 
             size_t len = mbstowcs(NULL, value, 0);
-            if (len < 0) {
+            if (len == (size_t)-1) {
                 LOG_AND_NOTIFY_ERRNO(
                     "%s:%d: [scrollback]: indicator-format: "
                     "invalid value: %s", path, lineno, value);
diff --git a/shm.c b/shm.c
index 2b2c3435..8a0a136d 100644
--- a/shm.c
+++ b/shm.c
@@ -131,10 +131,12 @@ page_size(void)
 {
     static size_t size = 0;
     if (size == 0) {
-        size = sysconf(_SC_PAGE_SIZE);
-        if (size < 0) {
+        long n = sysconf(_SC_PAGE_SIZE);
+        if (n <= 0) {
             LOG_ERRNO("failed to get page size");
             size = 4096;
+        } else {
+            size = (size_t)n;
         }
     }
     assert(size > 0);