fix: vcsim: extend PropertyCollector lock to avoid potential races

The collect() method needs to continue holding the object lock while processing selectSet.

Fixes #3697

Signed-off-by: Doug MacEachern <[email protected]>

Author: dougm

simulator/property_collector.go

@@ -531,21 +531,23 @@ func collect(ctx *Context, r *types.RetrievePropertiesEx) (*types.RetrieveResult
 	// Select object references
 	for _, spec := range r.SpecSet {
 		for _, o := range spec.ObjectSet {
-			var rval reflect.Value
-			ok := false
-			ctx.WithLock(o.Obj, func() { rval, ok = getObject(ctx, o.Obj) })
+			unlock := ctx.Map.AcquireLock(ctx, o.Obj)
+			rval, ok := getObject(ctx, o.Obj)
 			if !ok {
+				unlock()
 				if isFalse(spec.ReportMissingObjectsInResults) {
 					return nil, &types.ManagedObjectNotFound{Obj: o.Obj}
 				}
 				continue
 			}
 
 			if o.SelectSet == nil || isFalse(o.Skip) {
-				refs = append(refs, o.Obj)
+				rr.collect(ctx, o.Obj)
 			}
 
-			if err := rr.selectSet(ctx, rval, o.SelectSet, &refs); err != nil {
+			err := rr.selectSet(ctx, rval, o.SelectSet, &refs)
+			unlock()
+			if err != nil {
 				return nil, err
 			}
 		}