From: Dana Jansens Date: Sun, 11 Aug 2013 20:02:43 +0000 (-0400) Subject: Fix some use after free X-Git-Tag: release-2.0.4~33 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5c52d7ff38a6b7ee0985a2fd4697125325fc29de;p=dana%2Fobconf.git Fix some use after free --- diff --git a/src/moveresize.c b/src/moveresize.c index 47e91fc..6048a37 100644 --- a/src/moveresize.c +++ b/src/moveresize.c @@ -103,11 +103,11 @@ void moveresize_setup_tab() if (!strcasecmp(s, "Center")) pos = EDGE_CENTER; else if (opp) pos = EDGE_RIGHT; else pos = EDGE_LEFT; - g_free(s); gtk_option_menu_set_history(GTK_OPTION_MENU(w), pos); w = get_widget("fixed_x_pos"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), MAX(atoi(s), 0)); + g_free(s); w = get_widget("fixed_y_popup"); s = tree_get_string("resize/popupFixedPosition/y", "0"); @@ -115,11 +115,11 @@ void moveresize_setup_tab() if (!strcasecmp(s, "Center")) pos = EDGE_CENTER; else if (opp) pos = EDGE_RIGHT; else pos = EDGE_LEFT; - g_free(s); gtk_option_menu_set_history(GTK_OPTION_MENU(w), pos); w = get_widget("fixed_y_pos"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), MAX(atoi(s), 0)); + g_free(s); i = tree_get_int("mouse/screenEdgeWarpTime", 400);