Changeset 04c35fca in mainline

Timestamp:

2018-11-23T20:31:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a01f732

Parents:

cf3a905c (diff), 103db908 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-11-23 20:31:50)

git-committer:

GitHub <noreply@…> (2018-11-23 20:31:50)

Message:

Merge pull request #62 from maurizio-lombardi/memory_leaks

Fix a few memory leaks in fontviewer and the font library

Location:

uspace

Files:

• app/fontviewer/fontviewer.c (modified) (3 diffs)
• lib/draw/font/bitmap_backend.c (modified) (1 diff)

uspace/app/fontviewer/fontviewer.c

@@ -170 +170 @@
         source_t leading_bg = rgb(170, 238, 255);
         source_t leading_fg = rgb(0, 170, 212);
-
-        font_t *font;
+        font_t *info_font = NULL;
+        font_t *font = NULL;
+
         errno_t rc = create_font(&font, points);
         if (rc != EOK) {
                 printf("Failed creating font\n");
-                return rc;
-        }
-
-        font_t *info_font;
+                goto out_err;
+        }
+
         rc = embedded_font_create(&info_font, 16);
         if (rc != EOK) {
                 printf("Failed creating info font\n");
-                return rc;
+                goto out_err;
         }
 
@@ -188 +188 @@
         rc = font_get_metrics(font, &font_metrics);
         if (rc != EOK)
-                return rc;
+                goto out_err;
 
         surface_coord_t top = 50;
@@ -238 +238 @@
         }
 
-        font_release(font);
-        return EOK;
+out_err:
+        if (font)
+                font_release(font);
+        if (info_font)
+                font_release(info_font);
+        return rc;
 }
 

uspace/lib/draw/font/bitmap_backend.c

@@ -212 +212 @@
 
         data->decoder->release(data->decoder_data);
+        free(data);
 }