From 77a9ce1c7510cdf66bf038300ce57952748a3e05 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 10 Apr 2015 14:25:42 +0000
Subject: - fix for CREOleCallback constructor; - unsafe strlen call removed; -
 fix for static buffer lengths

git-svn-id: http://svn.miranda-ng.org/main/trunk@12736 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdchat/src/chat.h   |  2 +-
 src/core/stdchat/src/main.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/core/stdchat')

diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index 97c5496fd1..6212eb7c73 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -113,7 +113,7 @@ extern BOOL SmileyAddInstalled, PopupInstalled;
 
 struct CREOleCallback : public IRichEditOleCallback
 {
-	CREOleCallback() : refCount(0) {}
+	CREOleCallback() : refCount(0), nextStgId(0), pictStg(NULL) {}
 	unsigned refCount;
 	IStorage *pictStg;
 	int nextStgId;
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index 9437b3a034..48b31036a2 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -420,19 +420,19 @@ STDMETHODIMP CREOleCallback::QueryInterface(REFIID riid, LPVOID * ppvObj)
 
 STDMETHODIMP_(ULONG) CREOleCallback::AddRef()
 {
-	if (refCount == 0) {
-		if (S_OK != StgCreateDocfile(NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &pictStg))
-			pictStg = NULL;
-		nextStgId = 0;
-	}
+	if (refCount == 0)
+		StgCreateDocfile(NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &pictStg);
+
 	return ++refCount;
 }
 
 STDMETHODIMP_(ULONG) CREOleCallback::Release()
 {
 	if (--refCount == 0) {
-		if (pictStg)
+		if (pictStg) {
 			pictStg->Release();
+			pictStg = NULL;
+		}
 	}
 	return refCount;
 }
-- 
cgit v1.2.3