Changeset 67

Timestamp:

Sep 5, 2007, 11:24:34 AM (18 years ago)

Author:

Paul Smedley

Message:

Fix for problem with handling of cli structure

File:

• trunk/samba/source/ndpsmb/smbcd.c (modified) (2 diffs)

trunk/samba/source/ndpsmb/smbcd.c

@@ -699 +699 @@
         }
         pipe = (HPIPE)arg;
-        rc = DosAllocMem((PPVOID)&cli, smbwrp_getclisize(), PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
-        if (rc)
-        {
-                rc = DosAllocMem((PPVOID)&cli, smbwrp_getclisize(), PAG_COMMIT | PAG_READ | PAG_WRITE);
-        }
         cli = (cli_state *)calloc(smbwrp_getclisize(), 1);
-        if (rc || !cli)
+        if (!cli)
         {
                 debuglocal(0,"Not enough memory to initialize client structure\n");
+                DosDisConnectNPipe(pipe);
                 DosClose(pipe);
                 return;
         }
-        memset(cli, 0, smbwrp_getclisize());
         debuglocal(0,"opening client pipe %d\n", pipe);
         for (;;)
@@ -736 +731 @@
                         debuglocal(0,"shutdown client %d with rc %d\n", pipe, rc);
                         break;
-                // YD this seems to make PMView to show thumbnails faster, 
-                // no delay shown while using FOC. 
-                DosSleep(0); 
                 }
                 // YD this seems to make PMView to show thumbnails faster,
                 // no delay shown while using FOC.
                 DosSleep(0);
+                if (req.request == SMBREQ_DISCONNECT)
+                {
+                        /* The cli structure was deallocated. Reallocate it. */
+                        cli = (cli_state *)calloc(smbwrp_getclisize(), 1);
+                        if (!cli)
+                        {
+                                debuglocal(0,"Not enough memory to initialize client structure\n");
+                                break;
+                        }
+                }
         }
         debuglocal(0,"closing client pipe %d\n", pipe);
         DosDisConnectNPipe(pipe);
         DosClose(pipe);
-        memset(cli, 0, smbwrp_getclisize());
-        DosFreeMem(cli);
 }