Plug minor leaks in string conversion routines.

diff --git a/i3-input/ucs2_to_utf8.c b/i3-input/ucs2_to_utf8.c
index 4d73493c9c0e3862c7f3be4be6adc3074591d6b4..df112eefe65fe472772e268d19b2dd55ccf86af0 100644 (file)
--- a/i3-input/ucs2_to_utf8.c
+++ b/i3-input/ucs2_to_utf8.c
@@ -47,6 +47,7 @@ char *convert_ucs_to_utf8(char *input) {
     /* Convert our text */
     int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size);
     if (rc == (size_t)-1) {
+        free(buffer);
         perror("Converting to UCS-2 failed");
         return NULL;
     }
@@ -85,6 +86,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;

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;

diff --git a/src/util.c b/src/util.c
index f894eb3f57bdc9dc827ac6c5e44bcd1caa715d73..72146bff7aa7c1769a1d1d341255a738f1dfc62f 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -153,6 +153,7 @@ char *convert_utf8_to_ucs2(char *input, int *real_strlen) {
     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);
         if (real_strlen != NULL)
             *real_strlen = 0;
         return NULL;