summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2023-04-12 18:45:44 +0300
committerGeorge Hazan <ghazan@miranda.im>2023-04-12 18:45:44 +0300
commit3fe5f97dcd7c8ef8deabc32a83f5075df13bc8d2 (patch)
tree368e31221d2f0f0091d69a06f55934009aeaeeee /src/core
parenta58839666f1b2e81f1d85d833bbd8fefaf70046b (diff)
fix for another potential crash
Diffstat (limited to 'src/core')
-rw-r--r--src/core/stdfile/src/filerecvdlg.cpp3
-rw-r--r--src/core/stdmsg/src/msglog.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index 099f419fcb..34d5251985 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -251,7 +251,8 @@ public:
DB::FILE_BLOB blob(dbei);
SetDlgItemText(m_hwnd, IDC_FILENAMES, blob.getName());
- SetDlgItemText(m_hwnd, IDC_MSG, blob.getDescr());
+ if (mir_wstrlen(blob.getDescr()))
+ SetDlgItemText(m_hwnd, IDC_MSG, blob.getDescr());
wchar_t datetimestr[64];
TimeZone_PrintTimeStamp(NULL, dbei.timestamp, L"t d", datetimestr, _countof(datetimestr), 0);
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 778ae5f991..318e246ae3 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -332,7 +332,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
buf.Append(": ");
AppendToBufferWithRTF(buf, blob.getName());
- if (*blob.getDescr() != 0) {
+ if (mir_wstrlen(blob.getDescr())) {
buf.Append(" (");
AppendToBufferWithRTF(buf, blob.getDescr());
buf.Append(")");