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

Timestamp:

May 5, 2000, 8:21:36 PM (25 years ago)

Author:

sandervl

Message:

BindCtxImpl_SetBindOptions & BindCtxImpl_GetBindOptions bugfixes

File:

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

trunk/src/ole32/bindctx.cpp

@@ -1 @@
-/* $Id: bindctx.cpp,v 1.2 1999-11-12 12:00:14 davidr Exp $ */
+/* $Id: bindctx.cpp,v 1.3 2000-05-05 18:21:36 sandervl Exp $ */
 /* 
  * BindCtx implementation
@@ -307 +307 @@
         return E_POINTER;
     
-    This->bindOption2=*pbindopts;
+    if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
+    {
+        WARN("invalid size");
+        return E_INVALIDARG; /* FIXME : not verified */
+    }
+    memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct);
 
     return S_OK;
@@ -324 +329 @@
         return E_POINTER;
 
-    *pbindopts=This->bindOption2;
+    if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
+    {
+        WARN("invalid size");
+        return E_INVALIDARG; /* FIXME : not verified */
+    }
+    memcpy(pbindopts, &This->bindOption2, pbindopts->cbStruct);
     
     return S_OK;