Merge pull request shirou#487 from truthbk/fix-win-race

[host] fix race condition to ret
yangmengling · Feb 13, 2018 · 234a591 · 234a591
2 parents c432be2 + 178e5ce
commit 234a591
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cpu/cpu_windows.go b/cpu/cpu_windows.go
@@ -132,6 +132,10 @@ func PerfInfoWithContext(ctx context.Context) ([]Win32_PerfFormattedData_Counter
 	ctx, cancel := context.WithTimeout(context.Background(), common.Timeout)
 	defer cancel()
 	err := common.WMIQueryWithContext(ctx, q, &ret)
+	if err != nil {
+		return Win32_PerfFormattedData_Counters_ProcessorInformation{}, err
+	}
+
 	return ret, err
 }
 
@@ -147,6 +151,9 @@ func ProcInfoWithContext(ctx context.Context) ([]Win32_PerfFormattedData_PerfOS_
 	ctx, cancel := context.WithTimeout(context.Background(), common.Timeout)
 	defer cancel()
 	err := common.WMIQueryWithContext(ctx, q, &ret)
+	if err != nil {
+		return Win32_PerfFormattedData_PerfOS_System{}, err
+	}
 	return ret, err
 }