Merge branch 'fix-var-tabs'

[i3/i3] / i3bar / src / ucs2_to_utf8.c

diff --git a/i3bar/src/ucs2_to_utf8.c b/i3bar/src/ucs2_to_utf8.c
index 7797dc1f3df2f6e300c672e78a0c1473a78eaeae..642a72fb3d838812ba94fe27bc7ed94b26954493 100644 (file)
--- a/i3bar/src/ucs2_to_utf8.c
+++ b/i3bar/src/ucs2_to_utf8.c
@@ -49,6 +49,7 @@ char *convert_ucs_to_utf8(char *input) {
     int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size);
     if (rc == (size_t)-1) {
         perror("Converting to UCS-2 failed");
+        free(buffer);
         return NULL;
     }
 
@@ -88,6 +89,7 @@ char *convert_utf8_to_ucs2(char *input, int *real_strlen) {
     int rc = iconv(conversion_descriptor2, (void*)&input, &input_size, &output, &output_size);
     if (rc == (size_t)-1) {
         perror("Converting to UCS-2 failed");
+        free(buffer);
         if (real_strlen != NULL)
             *real_strlen = 0;
         return NULL;