summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-20 15:55:05 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-07-20 15:55:44 +0200
commite5a0755bc2f8129cb854367740a02c859555c033 (patch)
tree2b48b7beb473448187a649ad619f17331bfdc804 /xmerge
parent91a6ea5d6f75846983ab53ef477aa063786ac3fe (diff)
new does not return null
Change-Id: Iea00f7c6435c6ae3ccbb2f97ab4407df8b86c54b
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/activesync/XMergeFactory.cpp6
-rw-r--r--xmerge/source/activesync/XMergeSync.cpp6
2 files changed, 0 insertions, 12 deletions
diff --git a/xmerge/source/activesync/XMergeFactory.cpp b/xmerge/source/activesync/XMergeFactory.cpp
index a2cb631a3cf1..486d128fc3a3 100644
--- a/xmerge/source/activesync/XMergeFactory.cpp
+++ b/xmerge/source/activesync/XMergeFactory.cpp
@@ -84,12 +84,6 @@ STDMETHODIMP CXMergeFactory::CreateInstance(IUnknown *pUnkOuter, REFIID iid, voi
if (iid == IID_ICeFileFilter)
{
CXMergeFilter *pFilter = new CXMergeFilter();
- if(pFilter == NULL)
- {
- *ppvObject = NULL;
- return E_OUTOFMEMORY;
- }
-
HRESULT hr = pFilter->QueryInterface(iid, ppvObject);
pFilter->Release();
diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp
index f4f39461d0de..8c8178c8e613 100644
--- a/xmerge/source/activesync/XMergeSync.cpp
+++ b/xmerge/source/activesync/XMergeSync.cpp
@@ -56,12 +56,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
// Create the factory object
CXMergeFactory *pFactory = new CXMergeFactory();
- if (pFactory == NULL)
- {
- *ppv = NULL;
- return E_OUTOFMEMORY;
- }
-
HRESULT hr = pFactory->QueryInterface(riid, ppv);
pFactory->Release();