Merge pull request #4109 from i3/orestisfl-patch-2

i3-input: Fix memory leaks
tdemin · May 31, 2020 · db2526c · db2526c
2 parents c9f8183 + 128f9c0
commit db2526c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/i3-input/main.c b/i3-input/main.c
@@ -367,9 +367,8 @@ static xcb_rectangle_t get_window_position(void) {
 }
 
 int main(int argc, char *argv[]) {
-    format = sstrdup("%s");
     char *socket_path = NULL;
-    char *pattern = sstrdup("pango:monospace 8");
+    char *pattern = NULL;
     int o, option_index = 0;
 
     static struct option long_options[] = {
@@ -424,6 +423,9 @@ int main(int argc, char *argv[]) {
                 return 0;
         }
     }
+    if (!format) {
+        format = "%s";
+    }
 
     printf("using format \"%s\"\n", format);
 
@@ -440,7 +442,7 @@ int main(int argc, char *argv[]) {
     symbols = xcb_key_symbols_alloc(conn);
 
     init_dpi();
-    font = load_font(pattern, true);
+    font = load_font(pattern ? pattern : "pango:monospace 8", true);
     set_font(&font);
 
     if (prompt != NULL)