From 1f8f7ffbe8934abe9d66e84d9df836cd9dc0a727 Mon Sep 17 00:00:00 2001
From: Mark Jansen <mark.jansen@reactos.org>
Date: Fri, 2 Sep 2016 21:47:05 +0000
Subject: [PATCH] [ICMP] Fix IcmpCloseHandle crashing on NULL handle. Patch by
 Tim Crawford. CORE-10707 #resolve #comment Thanks!

svn path=/trunk/; revision=72538
---
 reactos/dll/win32/iphlpapi/icmp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/reactos/dll/win32/iphlpapi/icmp.c b/reactos/dll/win32/iphlpapi/icmp.c
index 4c171abc9d5..a67a867e3a1 100644
--- a/reactos/dll/win32/iphlpapi/icmp.c
+++ b/reactos/dll/win32/iphlpapi/icmp.c
@@ -222,7 +222,8 @@ HANDLE WINAPI IcmpCreateFile(VOID)
 BOOL WINAPI IcmpCloseHandle(HANDLE  IcmpHandle)
 {
     icmp_t* icp=(icmp_t*)IcmpHandle;
-    if (IcmpHandle==INVALID_HANDLE_VALUE) {
+    // REACTOS: Added a check for NULL handle, CORE-10707
+    if (IcmpHandle==INVALID_HANDLE_VALUE || IcmpHandle==NULL) {
         /* FIXME: in fact win98 seems to ignore the handle value !!! */
         SetLastError(ERROR_INVALID_HANDLE);
         return FALSE;