Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix memory issues #185

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix memory issues #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dae6fb
fix a few memory leaks
stbuehler Oct 2, 2023
1eb68ab
append `PKGLIBDIR"/cmd"` in TTYMUX_NEW
stbuehler Oct 2, 2023
db7de04
ttymux: free old screens/sessions on (new) ttymux_update_sessions
stbuehler Oct 2, 2023
3260cd0
TTYMUX_ATTACH: fix use after free - don't update session list, it is …
stbuehler Oct 2, 2023
58f1796
make handleXMLError actually use a const pointer
stbuehler Oct 3, 2024
c35e6e3
sscanf: fix cluster buffer length, and remove unnecessary manual zero…
stbuehler Oct 3, 2024
7c9a8ef
sscanf: remove wrong (too short) and unnecessary zero termination of …
stbuehler Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ SHARED_SOURCES = \
clusters.h \
glue.c \
glue.h \
ttymux.c \
ttymux.h \
$(FEAT_RUNCUST_SOURCES) $(FEAT_TTYMUX_SOURCES)

Expand Down
50 changes: 12 additions & 38 deletions src/exec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ gboolean
ssh_cmd_upgrade(HostNode *n, const gboolean detached)
{
gboolean r;
guint i;
GError *error = NULL;
gchar **argv = NULL;

Expand All @@ -115,14 +114,7 @@ ssh_cmd_upgrade(HostNode *n, const gboolean detached)
he.action = "upgrade";
he.data = NULL;

gchar **screen_argv = TTYMUX_NEW(n, detached);

argv = (gchar **) g_malloc0(sizeof(gchar *) * (g_strv_length(screen_argv) + 2));
for(i = 0; i < g_strv_length(screen_argv); i++)
argv[i] = g_strdup(screen_argv[i]);
argv[i] = g_strdup(PKGLIBDIR"/cmd");

g_strfreev(screen_argv);
argv = TTYMUX_NEW(n, detached);

#ifdef FEAT_HISTORY
n->parse_result = cfg->history_errpattern && strlen(cfg->history_errpattern);;
Expand All @@ -143,7 +135,10 @@ ssh_cmd_upgrade(HostNode *n, const gboolean detached)
}

#ifdef FEAT_HISTORY
if(!detached && n->parse_result && !TTYMUX_GET_SESSIONS(n)) {
/* TODO: we have no idea which session was created; if no session is left
* for the host we check for failures (returning TRUE on error in output).
*/
if(!detached && n->parse_result && !ttymux_update_sessions(n)) {
n->parse_result = FALSE;
return history_ts_failed(cfg, n);
}
Expand All @@ -156,7 +151,6 @@ gboolean
ssh_cmd_install(HostNode *n, gchar *package, const gboolean detached)
{
gboolean r;
guint i;
GError *error = NULL;
gchar **argv = NULL;

Expand All @@ -171,14 +165,7 @@ ssh_cmd_install(HostNode *n, gchar *package, const gboolean detached)
he.action = "install";
he.data = package;

gchar **screen_argv = TTYMUX_NEW(n, detached);

argv = (gchar **) g_malloc0(sizeof(gchar *) * (g_strv_length(screen_argv) + 2));
for(i = 0; i < g_strv_length(screen_argv); i++)
argv[i] = g_strdup(screen_argv[i]);
argv[i] = g_strdup(PKGLIBDIR"/cmd");

g_strfreev(screen_argv);
argv = TTYMUX_NEW(n, detached);

#ifdef FEAT_HISTORY
n->parse_result = cfg->history_errpattern && strlen(cfg->history_errpattern);
Expand All @@ -199,7 +186,10 @@ ssh_cmd_install(HostNode *n, gchar *package, const gboolean detached)
}

#ifdef FEAT_HISTORY
if(!detached && n->parse_result && !TTYMUX_GET_SESSIONS(n)) {
/* TODO: we have no idea which session was created; if no session is left
* for the host we check for failures (returning TRUE on error in output).
*/
if(!detached && n->parse_result && !ttymux_update_sessions(n)) {
n->parse_result = FALSE;
return history_ts_failed(cfg, n);
}
Expand All @@ -211,7 +201,6 @@ ssh_cmd_install(HostNode *n, gchar *package, const gboolean detached)
void ssh_connect(HostNode *n, const gboolean detached)
{
gboolean r;
guint i;
GError *error = NULL;
gchar **argv;

Expand All @@ -221,14 +210,7 @@ void ssh_connect(HostNode *n, const gboolean detached)
he.action = "connect";
he.data = NULL;

gchar **screen_argv = TTYMUX_NEW(n, detached);

argv = (gchar **) g_malloc0(sizeof(gchar *) * (g_strv_length(screen_argv) + 2));
for(i = 0; i < g_strv_length(screen_argv); i++)
argv[i] = g_strdup(screen_argv[i]);
argv[i] = g_strdup(PKGLIBDIR"/cmd");

g_strfreev(screen_argv);
argv = TTYMUX_NEW(n, detached);

gchar **env = env_build(n, "connect", NULL, &he);

Expand All @@ -248,7 +230,6 @@ void ssh_connect(HostNode *n, const gboolean detached)
void sftp_connect(HostNode *n)
{
gboolean r;
guint i;
GError *error = NULL;
gchar **argv;

Expand All @@ -260,14 +241,7 @@ void sftp_connect(HostNode *n)
he.action = "transfer";
he.data = NULL;

gchar **screen_argv = TTYMUX_NEW(n, FALSE);

argv = (gchar **) g_malloc0(sizeof(gchar *) * (g_strv_length(screen_argv) + 2));
for(i = 0; i < g_strv_length(screen_argv); i++)
argv[i] = g_strdup(screen_argv[i]);
argv[i] = g_strdup(PKGLIBDIR"/cmd");

g_strfreev(screen_argv);
argv = TTYMUX_NEW(n, FALSE);

gchar **env = env_build(n, "transfer", NULL, &he);

Expand Down
70 changes: 50 additions & 20 deletions src/keyfiles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "../conf/screenrc.inc"
#endif

void dump_config(const gchar *dir, const gchar *fn, const gchar *str, const unsigned int len) {
static void dump_config(const gchar *dir, const gchar *fn, const gchar *str, const unsigned int len) {
gchar *pathtofile = g_strdup_printf("%s/%s", dir, (fn));

if(!pathtofile)
Expand Down Expand Up @@ -86,6 +86,8 @@ int chkForInitialConfig(const gchar *cfgdir, const gchar *cfgfile) {
g_clear_error (&error);
}
}
g_free(fnold);
g_free(fnnew);

dump_config(cfgdir, "hosts.xml", (gchar *)hosts_xml, hosts_xml_len);
#ifdef FEAT_TMUX
Expand Down Expand Up @@ -153,7 +155,7 @@ CfgFile *initialConfig() {
return lcfg;
}

xmlXPathObjectPtr evalXPath(xmlXPathContextPtr context, const gchar *xpath) {
static xmlXPathObjectPtr evalXPath(xmlXPathContextPtr context, const gchar *xpath) {
xmlXPathObjectPtr result = xmlXPathEvalExpression(BAD_CAST(xpath), context);
if(result == NULL) {
g_warning("xmlXPathEvalExpression '%s' failed!\n", xpath);
Expand All @@ -163,7 +165,7 @@ xmlXPathObjectPtr evalXPath(xmlXPathContextPtr context, const gchar *xpath) {
return result;
}

char *getXPropStr(const xmlNodePtr nodes[], const gchar *attr, const gchar *defval) {
static char *getXPropStr(const xmlNodePtr nodes[], const gchar *attr, const gchar *defval) {
int i;
xmlChar *val = NULL;

Expand All @@ -183,7 +185,26 @@ char *getXPropStr(const xmlNodePtr nodes[], const gchar *attr, const gchar *defv
return NULL;
}

int getXPropInt(const xmlNodePtr nodes[], const gchar *attr, const int defval) {
/* defval is a string that either needs to be freed or returned as owned string */
static char *getXPropStrOwnedDefault(const xmlNodePtr nodes[], const gchar *attr, gchar *defval) {
int i;
xmlChar *val = NULL;

for(i = 0; nodes[i]; i++) {
val = xmlGetProp(nodes[i], BAD_CAST(attr));

if(val) {
gchar *ret = g_strdup((gchar *)val);
xmlFree(val);
g_free(defval);
return ret;
}
}

return defval;
}

static int getXPropInt(const xmlNodePtr nodes[], const gchar *attr, const int defval) {
gchar *sval = getXPropStr(nodes, attr, NULL);

if(!sval)
Expand All @@ -196,7 +217,7 @@ int getXPropInt(const xmlNodePtr nodes[], const gchar *attr, const int defval) {
return ival;
}

int getXPropBool(const xmlNodePtr nodes[], const gchar *attr, const gboolean defval) {
static int getXPropBool(const xmlNodePtr nodes[], const gchar *attr, const gboolean defval) {
gchar *val = getXPropStr(nodes, attr, NULL);
if(!val)
return defval;
Expand Down Expand Up @@ -224,15 +245,15 @@ int getXPropBool(const xmlNodePtr nodes[], const gchar *attr, const gboolean def
return FALSE;
}

xmlNodeSetPtr getXNodes(xmlXPathContextPtr context, const gchar *xpath) {
static xmlNodeSetPtr getXNodes(xmlXPathContextPtr context, const gchar *xpath) {
xmlXPathObjectPtr xobj = xmlXPathEvalExpression(BAD_CAST(xpath), context);
xmlNodeSetPtr ret = xobj->nodesetval;
xmlXPathFreeNodeSetList(xobj);

return ret;
}

xmlNodePtr getXNode(xmlXPathContextPtr context, const gchar *xpath) {
static xmlNodePtr getXNode(xmlXPathContextPtr context, const gchar *xpath) {
xmlNodeSetPtr set = getXNodes(context, xpath);
xmlNodePtr ret = NULL;

Expand All @@ -243,10 +264,12 @@ xmlNodePtr getXNode(xmlXPathContextPtr context, const gchar *xpath) {
return ret;
}

void xmlErrIgnoreHandler(void *ctx, const char *msg, ...) {
static void xmlErrIgnoreHandler(void *ctx, const char *msg, ...) {
}

void handleXMLError(const xmlErrorPtr e) {
static void handleXMLError() {
xmlError const *e = xmlGetLastError();

if(!e)
return;

Expand Down Expand Up @@ -278,7 +301,7 @@ void handleXMLError(const xmlErrorPtr e) {

fprintf(stderr, "%s", e->message);

xmlResetError(e);
xmlResetLastError();
}

gboolean loadConfig(const gchar *filename, CfgFile *lcfg) {
Expand All @@ -290,7 +313,7 @@ gboolean loadConfig(const gchar *filename, CfgFile *lcfg) {
/* Handle Xincludes. */
xmlSetGenericErrorFunc(NULL, xmlErrIgnoreHandler);
xmlXIncludeProcess(xcfg);
handleXMLError( xmlGetLastError() );
handleXMLError();
xmlSetGenericErrorFunc(NULL, NULL);

/* Validate against DTD. */
Expand Down Expand Up @@ -335,23 +358,24 @@ gboolean loadConfig(const gchar *filename, CfgFile *lcfg) {
lcfg->umask = getXPropInt(s_path, "umask", S_IRWXG | S_IRWXO);
umask(lcfg->umask);

lcfg->hostsfile = getXPropStr(s_path, "hosts-file", g_strdup_printf("%s/%s/%s", g_get_user_config_dir(), PROG_NAME, "hosts.xml"));
lcfg->statsdir = getXPropStr(s_path, "stats-dir", g_strdup_printf("%s/%s/%s", g_get_user_cache_dir(), PROG_NAME, "stats"));
lcfg->hostsfile = getXPropStrOwnedDefault(s_path, "hosts-file", g_strdup_printf("%s/%s/%s", g_get_user_config_dir(), PROG_NAME, "hosts.xml"));
lcfg->statsdir = getXPropStrOwnedDefault(s_path, "stats-dir", g_strdup_printf("%s/%s/%s", g_get_user_cache_dir(), PROG_NAME, "stats"));

if(g_mkdir_with_parents(lcfg->statsdir, S_IRWXU | S_IRWXG) == -1) {
g_warning("Failed to create %s: %s", lcfg->statsdir, g_strerror(errno));
exit(1);
}

#ifdef FEAT_TMUX
lcfg->tmuxconffile = getXPropStr(s_tmux, "conf-file", g_strdup_printf("%s/%s/%s", g_get_user_config_dir(), PROG_NAME, "tmux.conf"));
lcfg->tmuxsockpath = getXPropStr(s_tmux, "socket-path", g_strdup_printf("%s/%s/%s", g_get_user_cache_dir(), PROG_NAME, "tmux"));
lcfg->tmuxconffile = getXPropStrOwnedDefault(s_tmux, "conf-file", g_strdup_printf("%s/%s/%s", g_get_user_config_dir(), PROG_NAME, "tmux.conf"));
lcfg->tmuxsockpath = getXPropStrOwnedDefault(s_tmux, "socket-path", g_strdup_printf("%s/%s/%s", g_get_user_cache_dir(), PROG_NAME, "tmux"));
if(g_mkdir_with_parents(lcfg->tmuxsockpath, S_IRWXU | S_IRWXG) == -1) {
g_warning("Failed to create %s: %s", lcfg->tmuxsockpath, g_strerror(errno));
exit(1);
}
#else
lcfg->screenrcfile = getXPropStr(s_screen, "rc-file", g_strdup_printf("%s/%s/%s", g_get_user_config_dir(), PROG_NAME, "screenrc"));
lcfg->screentitle = getXPropStr(s_screen, "title", g_strdup("%m # %U%H"));
lcfg->screenrcfile = getXPropStrOwnedDefault(s_screen, "rc-file", g_strdup_printf("%s/%s/%s", g_get_user_config_dir(), PROG_NAME, "screenrc"));
lcfg->screentitle = getXPropStr(s_screen, "title", "%m # %U%H");
#endif

lcfg->ssh_agent = getXPropBool(s_ssh, "spawn-agent", FALSE);
Expand Down Expand Up @@ -386,6 +410,7 @@ gboolean loadConfig(const gchar *filename, CfgFile *lcfg) {
gchar *colors = getXPropStr(s_appearance, "colors", "menu brightgreen blue;status brightgreen blue;selector black red;");
if(colors)
lcfg->colors = g_strsplit(colors, ";", -1);
g_free(colors);

#ifdef FEAT_TCLFILTER
lcfg->filterexp = getXPropStr(s_tclfilter, "filter-exp", NULL);
Expand All @@ -402,7 +427,7 @@ gboolean loadConfig(const gchar *filename, CfgFile *lcfg) {
#ifdef FEAT_HISTORY
lcfg->record_history = getXPropBool(s_history, "record", TRUE);
lcfg->history_errpattern = getXPropStr(s_history, "err-pattern", "((?<!no )error|(?<!insserv: )warning|failed|fail(?!2ban))");
lcfg->history_dir = getXPropStr(s_path, "history-dir", g_strdup_printf("%s/%s/history", g_get_user_data_dir(), PACKAGE));
lcfg->history_dir = getXPropStrOwnedDefault(s_path, "history-dir", g_strdup_printf("%s/%s/history", g_get_user_data_dir(), PACKAGE));
#endif

lcfg->hook_pre_upgrade = getXPropStr(s_hooks, "pre-upgrade", "/etc/apt-dater/pre-upg.d");
Expand All @@ -417,10 +442,13 @@ gboolean loadConfig(const gchar *filename, CfgFile *lcfg) {

lcfg->plugindir = getXPropStr(s_hooks, "plugin-dir", "/etc/apt-dater/plugins");

xmlFreeDoc(xcfg);
xmlXPathFreeContext(xctx);

return (TRUE);
}

gint cmp_hosts(gconstpointer a, gconstpointer b, gpointer p) {
static gint cmp_hosts(gconstpointer a, gconstpointer b, gpointer p) {
HostNode *ha = (HostNode *)a;
HostNode *hb = (HostNode *)b;
gint ret;
Expand All @@ -441,7 +469,7 @@ GList *loadHosts (const gchar *filename) {
/* Handle Xincludes. */
xmlSetGenericErrorFunc(NULL, xmlErrIgnoreHandler);
xmlXIncludeProcess(xcfg);
handleXMLError( xmlGetLastError() );
handleXMLError();
xmlSetGenericErrorFunc(NULL, NULL);

/* Validate against DTD. */
Expand Down Expand Up @@ -539,5 +567,7 @@ GList *loadHosts (const gchar *filename) {
}

xmlXPathFreeObject(groups);
xmlXPathFreeContext(xctx);
xmlFreeDoc(xcfg);
return g_list_sort_with_data(hostlist, cmp_hosts, NULL);
}
Loading