1 files changed, 3 insertions, 2 deletions

diff --git a/src/charset.c b/src/charset.c
index 299655b2cf8..6aa6fe46b54 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1832,8 +1832,9 @@ encode_char (struct charset *charset, int c)
     }
   else                          /* method == CHARSET_METHOD_OFFSET */
     {
-      code = c - CHARSET_CODE_OFFSET (charset);
-      code = INDEX_TO_CODE_POINT (charset, code);
+      unsigned code_index = c - CHARSET_CODE_OFFSET (charset);
+
+      code = INDEX_TO_CODE_POINT (charset, code_index);
     }
 
   return code;