Changeset 4258 for trunk/src/ole32/bindctx.cpp

Timestamp:

Sep 14, 2000, 4:57:01 PM (25 years ago)

Author:

davidr

Message:

BugFixes & Updates (CorelWine)

File:

• trunk/src/ole32/bindctx.cpp (modified) (5 diffs)

trunk/src/ole32/bindctx.cpp

@@ -1 @@
-/* $Id: bindctx.cpp,v 1.3 2000-05-05 18:21:36 sandervl Exp $ */
+/* $Id: bindctx.cpp,v 1.4 2000-09-14 14:57:00 davidr Exp $ */
 /* 
  * BindCtx implementation
@@ -300 +300 @@
 HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts)
 {
+    DWORD size = sizeof(BIND_OPTS2);
+
     ICOM_THIS(BindCtxImpl,iface);
 
@@ -306 +308 @@
     if (pbindopts==NULL)
         return E_POINTER;
-    
-    if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
-    {
-        WARN("invalid size");
-        return E_INVALIDARG; /* FIXME : not verified */
-    }
-    memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct);
+
+    /* make sure we don't copy more bytes than we can */
+    if (pbindopts->cbStruct < size)
+        size = pbindopts->cbStruct;
+    
+    memcpy(&This->bindOption2, pbindopts, size);
 
     return S_OK;
@@ -322 +323 @@
 HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts)
 {
+    DWORD size = sizeof(BIND_OPTS2);
+
     ICOM_THIS(BindCtxImpl,iface);
 
@@ -329 +332 @@
         return E_POINTER;
 
-    if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
-    {
-        WARN("invalid size");
-        return E_INVALIDARG; /* FIXME : not verified */
-    }
-    memcpy(pbindopts, &This->bindOption2, pbindopts->cbStruct);
+    /* make sure we don't copy more bytes than we can */
+    if (pbindopts->cbStruct < size)
+        size = pbindopts->cbStruct;
+
+    memcpy(pbindopts, &This->bindOption2, size);
     
     return S_OK;