From 13aa3dd66cf5421e562679e480892f8f3f2a88f2 Mon Sep 17 00:00:00 2001
From: TLINDEN <git@daemon.de>
Date: Mon, 4 Nov 2013 16:24:03 +0100
Subject: [PATCH] backport fix d7c8021 of issue
 https://github.com/zeromq/zeromq4-x/issues/29.

---
 libpcp/zmq_z85.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libpcp/zmq_z85.c b/libpcp/zmq_z85.c
index dfda2df..2ab617e 100644
--- a/libpcp/zmq_z85.c
+++ b/libpcp/zmq_z85.c
@@ -91,7 +91,8 @@ uint8_t *zmq_z85_decode (uint8_t *dest, char *string)
     unsigned int byte_nbr = 0;
     unsigned int char_nbr = 0;
     uint32_t value = 0;
-    while (char_nbr < strlen (string)) {
+    uint string_len = strlen (string);
+    while (char_nbr < string_len) {
         //  Accumulate value in base 85
         value = value * 85 + decoder [(uint8_t) string [char_nbr++] - 32];
         if (char_nbr % 5 == 0) {