summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2012-01-30 18:58:15 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-01-31 19:57:14 +0100
commit82a61ea9e60237a848a5c29f71ecad7cae649340 (patch)
treebd660914ea4c5aadddfa731b11805bf5186e2741
parente65094bc923e39186048f25aa38cccb95d142355 (diff)
downloadptxdist-82a61ea9e60237a848a5c29f71ecad7cae649340.tar.gz
ptxdist-82a61ea9e60237a848a5c29f71ecad7cae649340.tar.xz
connman: add patch to fix segfault
Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/connman-0.78/0002-storage-Using-the-right-free-func.patch24
-rw-r--r--patches/connman-0.78/series1
2 files changed, 25 insertions, 0 deletions
diff --git a/patches/connman-0.78/0002-storage-Using-the-right-free-func.patch b/patches/connman-0.78/0002-storage-Using-the-right-free-func.patch
new file mode 100644
index 000000000..b297b52db
--- /dev/null
+++ b/patches/connman-0.78/0002-storage-Using-the-right-free-func.patch
@@ -0,0 +1,24 @@
+From 950569f6b46e141ccaf48d834438925ddb261baf Mon Sep 17 00:00:00 2001
+From: Flavio Ceolin <flavio.ceolin@profusion.mobi>
+Date: Thu, 5 Jan 2012 11:01:45 +0100
+Subject: [PATCH] storage: Using the right free func
+
+Fixing a segfault when it fails to store an information,
+just using g_error_free instead of g_free.
+---
+ src/storage.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/storage.c b/src/storage.c
+index 7dcf2e3..54c023d 100644
+--- a/src/storage.c
++++ b/src/storage.c
+@@ -68,7 +68,7 @@ static void storage_save(GKeyFile *keyfile, char *pathname)
+
+ if (!g_file_set_contents(pathname, data, length, &error)) {
+ DBG("Failed to store information: %s", error->message);
+- g_free(error);
++ g_error_free(error);
+ }
+
+ g_free(data);
diff --git a/patches/connman-0.78/series b/patches/connman-0.78/series
index 8ae4c83e5..5521be682 100644
--- a/patches/connman-0.78/series
+++ b/patches/connman-0.78/series
@@ -1 +1,2 @@
0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch
+0002-storage-Using-the-right-free-func.patch