5:42 a.m.
These patches concern mmsd for ofono mailing list.
Sébastien Bianti (3):
service: remove dead file
service: fixed possible meta with NULL uuid
service: remove pdu without meta
src/service.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
--
1.7.4.4
5:42 a.m.
New subject: [PATCH 1/3] service: remove dead file
---
src/service.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/service.c b/src/service.c
index ef6b544..3fdf4e0 100644
--- a/src/service.c
+++ b/src/service.c
@@ -755,6 +755,7 @@ static DBusMessage *send_message(DBusConnection *conn,
release_attachement_data(msg->attachments);
mms_message_free(msg);
+ unlink(request->data_path);
mms_request_destroy(request);
return __mms_error_trans_failure(dbus_msg);
--
1.7.4.4
5:42 a.m.
New subject: [PATCH 2/3] service: fixed possible meta with NULL uuid
If mms_store_file fails.
---
src/service.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/service.c b/src/service.c
index 3fdf4e0..0161ec0 100644
--- a/src/service.c
+++ b/src/service.c
@@ -767,6 +767,15 @@ static DBusMessage *send_message(DBusConnection *conn,
msg->uuid = g_strdup(mms_store_file(service->identity,
request->data_path));
+ if (msg->uuid == NULL) {
+ release_attachement_data(msg->attachments);
+ mms_message_free(msg);
+
+ unlink(request->data_path);
+ mms_request_destroy(request);
+
+ return __mms_error_trans_failure(dbus_msg);
+ }
meta = mms_store_meta_open(service->identity, msg->uuid);
if (meta == NULL) {
--
1.7.4.4
5:42 a.m.
New subject: [PATCH 3/3] service: remove pdu without meta
---
src/service.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/service.c b/src/service.c
index 0161ec0..8dbee12 100644
--- a/src/service.c
+++ b/src/service.c
@@ -777,11 +777,17 @@ static DBusMessage *send_message(DBusConnection *conn,
return __mms_error_trans_failure(dbus_msg);
}
+ 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) {
release_attachement_data(msg->attachments);
mms_message_free(msg);
+ unlink(request->data_path);
mms_request_destroy(request);
return __mms_error_trans_failure(dbus_msg);
@@ -804,11 +810,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);
--
1.7.4.4
3834
days inactive
3834
days old
3 comments
1 participants
participants (1)
-
Sébastien Bianti