io-glib: fix for invalid access

ElektraInitiative · Aug 18, 2018 · d9f855e · d9f855e
1 parent 9744189
commit d9f855e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/bindings/io/glib/io_glib.c b/src/bindings/io/glib/io_glib.c
@@ -178,6 +178,17 @@ static int ioGlibBindingFdDispatch (GSource * source, GSourceFunc callback, void
 	return G_SOURCE_CONTINUE;
 }
 
+/**
+ * Cleanup after file descriptor has been detached
+ * @param  source glib source
+ */
+static void ioGlibBindingFdCleanup (GSource * source)
+{
+	FdSource * fdSource = (FdSource *) source;
+	elektraFree (fdSource->bindingData->fdFuncs);
+	elektraFree (fdSource->bindingData);
+}
+
 /**
  * Calls the associated callback.
  * Called by glib whenever a timer has elapsed.
@@ -282,7 +293,7 @@ static int ioGlibBindingAddFd (ElektraIoInterface * binding, ElektraIoFdOperatio
 	funcs->prepare = ioGlibBindingFdPrepare;
 	funcs->check = ioGlibBindingFdCheck;
 	funcs->dispatch = ioGlibBindingFdDispatch;
-	funcs->finalize = NULL;
+	funcs->finalize = ioGlibBindingFdCleanup;
 	bindingData->fdFuncs = funcs;
 	FdSource * fdSource = (FdSource *) g_source_new (funcs, sizeof *fdSource);
 	GSource * gSource = &fdSource->gSource;
@@ -320,8 +331,6 @@ static int ioGlibBindingRemoveFd (ElektraIoFdOperation * fdOp)
 	}
 	g_source_destroy (gSource);
 	g_source_unref (gSource);
-	elektraFree (bindingData->fdFuncs);
-	elektraFree (bindingData);
 
 	return 1;
 }