r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[jra/samba/.git] / source3 / rpc_client / cli_echo.c

diff --git a/source3/rpc_client/cli_echo.c b/source3/rpc_client/cli_echo.c
index 03a4ab36ee0d163d219aced9ce926eabccb578da..1ae7aaa8e7070fb3c6cb9f35abb047fa5775b8d8 100644 (file)
--- a/source3/rpc_client/cli_echo.c
+++ b/source3/rpc_client/cli_echo.c
@@ -35,8 +35,13 @@ NTSTATUS cli_echo_add_one(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        /* Initialise parse structures */
 
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+       if (!prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       if (!prs_init(&rbuf, 0, mem_ctx, UNMARSHALL)) {
+               prs_mem_free(&qbuf);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Marshall data and send request */
 
@@ -76,8 +81,13 @@ NTSTATUS cli_echo_data(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        /* Initialise parse structures */
 
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+       if (!prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       if (!prs_init(&rbuf, 0, mem_ctx, UNMARSHALL)) {
+               prs_mem_free(&qbuf);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Marshall data and send request */
 
@@ -95,7 +105,7 @@ NTSTATUS cli_echo_data(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        result = True;
 
        if (out_data) {
-               *out_data = talloc(mem_ctx, size);
+               *out_data = TALLOC(mem_ctx, size);
                memcpy(*out_data, r.data, size);
        }
 
@@ -119,8 +129,13 @@ NTSTATUS cli_echo_sink_data(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        /* Initialise parse structures */
 
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+       if (!prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       if (!prs_init(&rbuf, 0, mem_ctx, UNMARSHALL)) {
+               prs_mem_free(&qbuf);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Marshall data and send request */
 
@@ -159,8 +174,13 @@ NTSTATUS cli_echo_source_data(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        /* Initialise parse structures */
 
-       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+       if (!prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       if (!prs_init(&rbuf, 0, mem_ctx, UNMARSHALL)) {
+               prs_mem_free(&qbuf);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Marshall data and send request */