Merge pull request #4 from ceshihao/fix/toIDispatchErr

fix VARIANT is nil in toIDispatchErr
ceshihao · Jul 7, 2022 · a6bb9fd · a6bb9fd
2 parents fd2de94 + 7c8d529
commit a6bb9fd
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/oleconv.go b/oleconv.go
@@ -23,7 +23,7 @@ func toIDispatchErr(result *ole.VARIANT, err error) (*ole.IDispatch, error) {
 	if err != nil {
 		return nil, err
 	}
-	return result.ToIDispatch(), nil
+	return variantToIDispatch(result), nil
 }
 
 func toInt64Err(result *ole.VARIANT, err error) (int64, error) {
@@ -75,6 +75,13 @@ func toTimeErr(result *ole.VARIANT, err error) (*time.Time, error) {
 	return variantToTime(result), nil
 }
 
+func variantToIDispatch(v *ole.VARIANT) *ole.IDispatch {
+	if v == nil {
+		return nil
+	}
+	return v.ToIDispatch()
+}
+
 func variantToInt64(v *ole.VARIANT) int64 {
 	value := v.Value()
 	if value == nil {