Changeset 745 for trunk/server/source4/libcli/raw/rawnotify.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/raw/rawnotify.c (modified) (2 diffs)

trunk/server/source4/libcli/raw/rawnotify.c

@@ -72 +72 @@
         parms->nttrans.out.changes = NULL;
         parms->nttrans.out.num_changes = 0;
-        
+
         /* count them */
         for (ofs=0; nt.out.params.length - ofs > 12; ) {
                 uint32_t next = IVAL(nt.out.params.data, ofs);
+                if (next % 4 != 0)
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
                 parms->nttrans.out.num_changes++;
                 if (next == 0 ||
@@ -156 +158 @@
          * but we want to keep it under oldreq->ntcancel
          */
-        if (!talloc_reference(oldreq, req)) {
-                talloc_free(req);
-                return NT_STATUS_NO_MEMORY;
-        }
+        req->do_not_free = true;
+        talloc_steal(oldreq, req);
 
         smbcli_request_send(req);