Changeset 55461 in vbox

Timestamp:

Apr 27, 2015 5:21:57 PM (9 years ago)

Author:

vboxsync

Message:

HostServices/Service.h: Better error check for copyParmsInternal().

File:

• trunk/include/VBox/HostServices/Service.h (modified) (1 diff)

trunk/include/VBox/HostServices/Service.h

@@ -198 +198 @@
                     }
 
-                    if (   paParmsDst[i].u.pointer.addr
-                        && paParmsSrc[i].u.pointer.size > 0
-                        && paParmsDst[i].u.pointer.size > 0)
+                    if (paParmsSrc[i].u.pointer.size) 
                     {
-                        memcpy(paParmsDst[i].u.pointer.addr,
-                               paParmsSrc[i].u.pointer.addr,
-                               RT_MIN(paParmsDst[i].u.pointer.size, paParmsSrc[i].u.pointer.size));
+                        if (   paParmsDst[i].u.pointer.addr
+                            && paParmsDst[i].u.pointer.size)
+                        {
+                            memcpy(paParmsDst[i].u.pointer.addr,
+                                   paParmsSrc[i].u.pointer.addr,
+                                   RT_MIN(paParmsDst[i].u.pointer.size, paParmsSrc[i].u.pointer.size));
+                        }
+                        else 
+                            rc = VERR_INVALID_POINTER;
                     }
-                    else
-                        rc = VERR_INVALID_POINTER;
                     break;
                 }