9:12 a.m.
This series concerns mmsd for ofono mailing list.
Patch 1 to 3 fix some leaks when a problem arises when a send request is
created.
Sébastien Bianti (3):
service: factorize error code
service: NULL uuid here is an error
service: remove orphan file
src/service.c | 66 ++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 40 deletions(-)
--
1.7.4.4
9:12 a.m.
New subject: [PATCH v3 1/3] service: factorize error code
---
src/service.c | 55 +++++++++++++++++++------------------------------------
1 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/src/service.c b/src/service.c
index 5fda8a1..25a4fc4 100644
--- a/src/service.c
+++ b/src/service.c
@@ -733,30 +733,16 @@ static DBusMessage *send_message(DBusConnection *conn,
}
msg->transaction_id = create_transaction_id();
- if (msg->transaction_id == NULL) {
- release_attachement_data(msg->attachments);
- mms_message_free(msg);
-
- return __mms_error_trans_failure(dbus_msg);
- }
+ if (msg->transaction_id == NULL)
+ goto release_msg;
request = create_request(MMS_REQUEST_TYPE_POST,
result_request_send_conf, NULL, service, msg);
- if (request == NULL) {
- release_attachement_data(msg->attachments);
- mms_message_free(msg);
-
- return __mms_error_trans_failure(dbus_msg);
- }
-
- if (mms_message_encode(msg, request->fd) == FALSE) {
- release_attachement_data(msg->attachments);
- mms_message_free(msg);
-
- mms_request_destroy(request);
+ if (request == NULL)
+ goto release_msg;
- return __mms_error_trans_failure(dbus_msg);
- }
+ if (mms_message_encode(msg, request->fd) == FALSE)
+ goto release_request;
close(request->fd);
@@ -766,27 +752,15 @@ static DBusMessage *send_message(DBusConnection *conn,
request->data_path));
meta = mms_store_meta_open(service->identity, msg->uuid);
- if (meta == NULL) {
- release_attachement_data(msg->attachments);
- mms_message_free(msg);
-
- mms_request_destroy(request);
-
- return __mms_error_trans_failure(dbus_msg);
- }
+ if (meta == NULL)
+ goto release_request;
g_key_file_set_string(meta, "info", "state", "draft");
mms_store_meta_close(service->identity, msg->uuid, meta, TRUE);
- if (mms_message_register(service, msg) < 0) {
- release_attachement_data(msg->attachments);
- mms_message_free(msg);
-
- mms_request_destroy(request);
-
- return __mms_error_trans_failure(dbus_msg);
- }
+ if (mms_message_register(service, msg) < 0)
+ goto release_request;
emit_message_added(service, msg);
@@ -811,6 +785,15 @@ static DBusMessage *send_message(DBusConnection *conn,
&msg->path);
return reply;
+
+release_request:
+ mms_request_destroy(request);
+
+release_msg:
+ release_attachement_data(msg->attachments);
+ mms_message_free(msg);
+
+ return __mms_error_trans_failure(dbus_msg);
}
static GDBusMethodTable service_methods[] = {
--
1.7.4.4
9:12 a.m.
New subject: [PATCH v3 2/3] service: NULL uuid here is an error
---
src/service.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/service.c b/src/service.c
index 25a4fc4..25a2563 100644
--- a/src/service.c
+++ b/src/service.c
@@ -750,6 +750,8 @@ static DBusMessage *send_message(DBusConnection *conn,
msg->uuid = g_strdup(mms_store_file(service->identity,
request->data_path));
+ if (msg->uuid == NULL)
+ goto release_request;
meta = mms_store_meta_open(service->identity, msg->uuid);
if (meta == NULL)
--
1.7.4.4
9:12 a.m.
New subject: [PATCH v3 3/3] service: remove orphan file
---
src/service.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/service.c b/src/service.c
index 25a2563..755ebc3 100644
--- a/src/service.c
+++ b/src/service.c
@@ -753,6 +753,11 @@ static DBusMessage *send_message(DBusConnection *conn,
if (msg->uuid == NULL)
goto release_request;
+ g_free(request->data_path);
+
+ request->data_path = g_strdup_printf("%s/.mms/%s/%s", g_get_home_dir(),
+ service->identity, msg->uuid);
+
meta = mms_store_meta_open(service->identity, msg->uuid);
if (meta == NULL)
goto release_request;
@@ -768,11 +773,6 @@ static DBusMessage *send_message(DBusConnection *conn,
release_attachement_data(msg->attachments);
- g_free(request->data_path);
-
- request->data_path = g_strdup_printf("%s/.mms/%s/%s", g_get_home_dir(),
- service->identity, msg->uuid);
-
g_queue_push_tail(service->request_queue, request);
activate_bearer(service);
@@ -789,6 +789,7 @@ static DBusMessage *send_message(DBusConnection *conn,
return reply;
release_request:
+ unlink(request->data_path);
mms_request_destroy(request);
release_msg:
--
1.7.4.4
3787
days inactive
3791
days old
4 comments
2 participants
participants (2)
-
Marcel Holtmann -
Sébastien Bianti