Changeset 20851 in vbox for trunk/src/VBox/Main/webservice/vboxweb.cpp

Timestamp:

Jun 23, 2009 3:34:25 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

48992

Message:

Webservice: handle NULL pointer object arguments in methods and return values correctly, both in raw webservice and OO JAX-WS wrappers

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (4 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1107 +1107 @@
  */
 int ManagedObjectRef::findRefFromId(const WSDLT_ID &id,
-                                    ManagedObjectRef **pRef)
+                                    ManagedObjectRef **pRef,
+                                    bool fNullAllowed)
 {
     int rc = 0;
@@ -1113 +1114 @@
     do
     {
+        // allow NULL (== empty string) input reference, which should return a NULL pointer
+        if (!id.length() && fNullAllowed)
+        {
+            *pRef = NULL;
+            return 0;
+        }
+
         uint64_t sessid;
         uint64_t objid;
@@ -1179 +1187 @@
     do {
         ManagedObjectRef *pRef;
-        if (!ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef))
+        if (!ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false))
             resp->returnval = pRef->getInterfaceName();
 
@@ -1210 +1218 @@
     do {
         ManagedObjectRef *pRef;
-        if ((rc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef)))
+        if ((rc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false)))
         {
             RaiseSoapInvalidObjectFault(soap, req->_USCOREthis);