]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Check to avoid calling iconv_close(-1) in openconnect_vpninfo_free
authorChad Catlett <chad@catlett.info>
Wed, 27 Aug 2014 23:34:23 +0000 (18:34 -0500)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 28 Aug 2014 08:42:26 +0000 (09:42 +0100)
Signed-off-by: Chad Catlett <chad@catlett.info>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
library.c

index 0e77c3be47a4fc1465377ac775d71fc18cc8fb51..66db4587677a0ac83b40f95ccf93924b6781330b 100644 (file)
--- a/library.c
+++ b/library.c
@@ -156,8 +156,11 @@ void openconnect_vpninfo_free(struct openconnect_info *vpninfo)
        }
 
 #ifdef HAVE_ICONV
-       iconv_close(vpninfo->ic_utf8_to_legacy);
-       iconv_close(vpninfo->ic_legacy_to_utf8);
+       if (vpninfo->ic_utf8_to_legacy != (iconv_t)-1)
+               iconv_close(vpninfo->ic_utf8_to_legacy);
+
+       if (vpninfo->ic_legacy_to_utf8 != (iconv_t)-1)
+               iconv_close(vpninfo->ic_legacy_to_utf8);
 #endif
 #ifdef _WIN32
        if (vpninfo->cmd_event)