diff options
| author | George Hazan <ghazan@miranda.im> | 2021-06-05 17:50:34 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-06-05 17:50:34 +0300 |
| commit | d7c9eb34f80f207efd47d2fc65e31aedf166c323 (patch) | |
| tree | 338b9b905674dc31b1efab739dfcedeed3d8d7b3 /src/core/stdmsg | |
| parent | ffc5a3d7550528281976745279e77ac9faba551b (diff) | |
major code cleaning in regard to db_event_getBlobSize & event memory allocation
Diffstat (limited to 'src/core/stdmsg')
| -rw-r--r-- | src/core/stdmsg/src/msglog.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 3161dff215..7905452248 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -201,17 +201,13 @@ int DbEventIsShown(DBEVENTINFO *dbei) //mir_free() the return value
static bool CreateRTFFromDbEvent(LogStreamData *dat)
{
- DBEVENTINFO dbei = {};
- dbei.cbBlob = db_event_getBlobSize(dat->hDbEvent);
- if (dbei.cbBlob == -1)
+ DB::EventInfo dbei;
+ dbei.cbBlob = -1;
+ if (db_event_get(dat->hDbEvent, &dbei))
return false;
- dbei.pBlob = (PBYTE)mir_alloc(dbei.cbBlob);
- db_event_get(dat->hDbEvent, &dbei);
- if (!DbEventIsShown(&dbei)) {
- mir_free(dbei.pBlob);
+ if (!DbEventIsShown(&dbei))
return false;
- }
if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) {
db_event_markRead(dat->hContact, dat->hDbEvent);
@@ -338,7 +334,6 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat) if (bIsRtl)
buf.Append("\\par");
- mir_free(dbei.pBlob);
return true;
}
|