ea@reactos.com

Make SmConnectApiPort more safe.

svn path=/trunk/; revision=14015

diff --git a/reactos/lib/smdll/connect.c b/reactos/lib/smdll/connect.c
index 6c93434..32a1ab6 100644 (file)
--- a/reactos/lib/smdll/connect.c
+++ b/reactos/lib/smdll/connect.c
@@ -61,9 +61,12 @@ SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
     }
     RtlZeroMemory (& ConnectData, sizeof ConnectData);
     ConnectData.Subsystem = dwSubsystem;
     }
     RtlZeroMemory (& ConnectData, sizeof ConnectData);
     ConnectData.Subsystem = dwSubsystem;

-    RtlCopyMemory (& ConnectData.SbName,
-                  pSbApiPortName->Buffer,
-                  pSbApiPortName->Length);
+    if (pSbApiPortName->Length > 0)
+    {
+      RtlCopyMemory (& ConnectData.SbName,
+                    pSbApiPortName->Buffer,
+                    pSbApiPortName->Length);
+    }

   }
   ConnectDataLength = sizeof ConnectData;
 
   }
   ConnectDataLength = sizeof ConnectData;
 


@@ -73,7 +76,7 @@ SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
   SecurityQos.EffectiveOnly       = TRUE;
 
   RtlInitUnicodeString (& SmApiPortName, SM_API_PORT_NAME);
   SecurityQos.EffectiveOnly       = TRUE;
 
   RtlInitUnicodeString (& SmApiPortName, SM_API_PORT_NAME);

-DbgPrint("SMDLL: calling NtConnectPort\n");
+

   Status = NtConnectPort (
              phSmApiPort,
              & SmApiPortName,
   Status = NtConnectPort (
              phSmApiPort,
              & SmApiPortName,