Changeset 862 for trunk/server/librpc/rpc/dcerpc_util.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/rpc/dcerpc_util.c (modified) (3 diffs)

trunk/server/librpc/rpc/dcerpc_util.c

@@ -46 +46 @@
         } else {
                 return RSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET);
+        }
+}
+
+uint32_t dcerpc_get_call_id(const DATA_BLOB *blob)
+{
+        if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) {
+                return IVAL(blob->data, DCERPC_CALL_ID_OFFSET);
+        } else {
+                return RIVAL(blob->data, DCERPC_CALL_ID_OFFSET);
         }
 }
@@ -224 +233 @@
                 ofs = state->buffer.length;
 
+                if (frag_len < ofs) {
+                        /*
+                         * something is wrong, let the caller deal with it
+                         */
+                        *_vector = NULL;
+                        *_count = 0;
+                        return 0;
+                }
+
                 state->buffer.data = talloc_realloc(state,
                                                     state->buffer.data,
@@ -293 +311 @@
         }
 
+        if (state->pkt->frag_length != state->buffer.length) {
+                tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
+                return;
+        }
+
         tevent_req_done(req);
 }