fix: NRE with null returning function

dupdob · dupdob · commit a7e8bfc20867 · 2023-12-13T13:34:15.000+01:00
diff --git a/code/src/NFluent/Extensions/ObjectExtensions.cs b/code/src/NFluent/Extensions/ObjectExtensions.cs
@@ -69,9 +69,8 @@ public static bool IsAwaitable<T>(this T instance, out Action waiter)
                 waiter = () => ta.Wait(); 
                 return true;
             } 
-            var awaiter= instance.GetType().GetMethod("GetAwaiter")?.ReturnType;
-            if (awaiter != null 
-                && awaiter.GetInterface("System.Runtime.CompilerServices.INotifyCompletion") != null
+            var awaiter= instance?.GetType().GetMethod("GetAwaiter")?.ReturnType;
+            if (awaiter?.GetInterface("System.Runtime.CompilerServices.INotifyCompletion") != null
                 && awaiter.GetProperty("IsCompleted")?.PropertyType != typeof(bool)
                 && awaiter.GetMethod("GetResult", Array.Empty<Type>())!=null)
             {

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,8 @@ public static bool IsAwaitable<T>(this T instance, out Action waiter)`
`69`	`69`	`waiter = () => ta.Wait();`
`70`	`70`	`return true;`
`71`	`71`	`}`
`72`		`- var awaiter= instance.GetType().GetMethod("GetAwaiter")?.ReturnType;`
`73`		`- if (awaiter != null`
`74`		`- && awaiter.GetInterface("System.Runtime.CompilerServices.INotifyCompletion") != null`
	`72`	`+ var awaiter= instance?.GetType().GetMethod("GetAwaiter")?.ReturnType;`
	`73`	`+ if (awaiter?.GetInterface("System.Runtime.CompilerServices.INotifyCompletion") != null`
`75`	`74`	`&& awaiter.GetProperty("IsCompleted")?.PropertyType != typeof(bool)`
`76`	`75`	`&& awaiter.GetMethod("GetResult", Array.Empty<Type>())!=null)`
`77`	`76`	`{`