From 2804098f4ff84eb33fcff980767f3b9b4d174e3b Mon Sep 17 00:00:00 2001
From: Aiden Luo <aiden0xz@gmail.com>
Date: Tue, 28 Aug 2018 18:28:44 +0800
Subject: [PATCH] GUACAMOLE-614: Fix uninitialized local variable

---
 src/common/iconv.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/common/iconv.c b/src/common/iconv.c
index ddc736fc..4d87e2e2 100644
--- a/src/common/iconv.c
+++ b/src/common/iconv.c
@@ -67,31 +67,18 @@ int guac_iconv(guac_iconv_read* reader, const char** input, int in_remaining,
     while (in_remaining > 0 && out_remaining > 0) {
 
         int value;
-        int count;
         const char* read_start;
         char* write_start;
 
         /* Read character */
         read_start = *input;
         value = reader(input, in_remaining);
-        count = *input - read_start;
-
-        /* Stop if read zero byte */
-        if (count == 0)
-            break;
-
-        in_remaining -= count;
+        in_remaining -= *input - read_start;
 
         /* Write character */
         write_start = *output;
         writer(output, out_remaining, value);
-        count = *output - write_start;
-
-        /* Stop if write zero byte */
-        if (count == 0)
-            break;
-
-        out_remaining -= count;
+        out_remaining -= *output - write_start;
 
         /* Stop if null terminator reached */
         if (value == 0)
@@ -106,7 +93,7 @@ int guac_iconv(guac_iconv_read* reader, const char** input, int in_remaining,
 
 int GUAC_READ_UTF8(const char** input, int remaining) {
 
-    int value;
+    int value = 0;
 
     *input += guac_utf8_read(*input, remaining, &value);
     return value;