emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

server: clear up move_docid 

Ensure all paths free resources
This commit is contained in:
Dirk-Jan C. Binnema 2020-02-15 14:12:21 +02:00
parent beb1b3199f
commit 10fa0727ef
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mu/mu-cmd-server.cc
View File

@ -933,24 +933,26 @@ static void
move_docid (MuStore *store, DocId docid, const std::string& flagstr,
bool new_name, bool no_view)
{
GError *gerr{};
auto msg{mu_store_get_msg (store, docid, &gerr)};
if (!msg)
throw Error{Error::Code::Store, &gerr, "failed to get message from store"};
if (docid == MU_STORE_INVALID_DOCID)
throw Error{Error::Code::InvalidArgument, "invalid docid"};
const auto flags = flagstr.empty() ? mu_msg_get_flags (msg) :
get_flags (mu_msg_get_path(msg), flagstr);
if (flags == MU_FLAG_INVALID) {
mu_msg_unref(msg);
throw Error{Error::Code::InvalidArgument, "invalid flags '%s'", flagstr.c_str()};
}
GError *gerr{};
auto msg{mu_store_get_msg (store, docid, &gerr)};
try {
if (!msg)
throw Error{Error::Code::Store, &gerr, "failed to get message from store"};
const auto flags = flagstr.empty() ? mu_msg_get_flags (msg) :
get_flags (mu_msg_get_path(msg), flagstr);
if (flags == MU_FLAG_INVALID)
throw Error{Error::Code::InvalidArgument, "invalid flags '%s'", flagstr.c_str()};
do_move (store, docid, msg, "", flags, new_name, no_view);
} catch (...) {
mu_msg_unref (msg);
if (msg)
mu_msg_unref (msg);
throw;
}