notmuch_database_add_message: Do not return a message on failure.

[notmuch] / database.cc

diff --git a/database.cc b/database.cc
index 8d477eca069abb7e3d1619d5881d3b3ad8d44469..0fd0bdadf8103366b4c2f95924926d1f532df0ca 100644 (file)
--- a/database.cc
+++ b/database.cc
@@ -836,6 +836,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
     const char *from, *to, *subject, *old_filename;
     char *message_id;
 
     const char *from, *to, *subject, *old_filename;
     char *message_id;
 

+    if (message_ret)
+       *message_ret = NULL;
+

     message_file = notmuch_message_file_open (filename);
     if (message_file == NULL) {
        ret = NOTMUCH_STATUS_FILE_ERROR;
     message_file = notmuch_message_file_open (filename);
     if (message_file == NULL) {
        ret = NOTMUCH_STATUS_FILE_ERROR;


@@ -932,7 +935,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
   DONE:
     if (message) {
 
   DONE:
     if (message) {

-       if (message_ret)
+       if (ret == NOTMUCH_STATUS_SUCCESS && message_ret)

            *message_ret = message;
        else
            notmuch_message_destroy (message);
            *message_ret = message;
        else
            notmuch_message_destroy (message);