Robert Shearman : oleaut32: Remove deadcode in SafeArrayPutElement.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Apr 7 08:05:37 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: f74dfe31825a9a9d71da5aadd24211048d1ad116
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=f74dfe31825a9a9d71da5aadd24211048d1ad116

Author: Robert Shearman <rob at codeweavers.com>
Date:   Fri Apr  7 11:17:29 2006 +0100

oleaut32: Remove deadcode in SafeArrayPutElement.

Remove deadcode in SafeArrayPutElement, as lpBstr cannot be NULL
because of the check at the top of the function on pvData (found by
Coverity).

---

 dlls/oleaut32/safearray.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 4ff056a..a8a7063 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -894,14 +894,9 @@ HRESULT WINAPI SafeArrayPutElement(SAFEA
         if (*lpDest)
          SysFreeString(*lpDest);
 
-        if (lpBstr)
-        {
-          *lpDest = SysAllocStringByteLen((char*)lpBstr, SysStringByteLen(lpBstr));
-          if (!*lpDest)
-            hRet = E_OUTOFMEMORY;
-        }
-        else
-          *lpDest = NULL;
+        *lpDest = SysAllocStringByteLen((char*)lpBstr, SysStringByteLen(lpBstr));
+        if (!*lpDest)
+          hRet = E_OUTOFMEMORY;
       }
       else
       {




More information about the wine-cvs mailing list