r10019: Only return NT_STATUS_NO_MEMORY if the alloc failed..
authorJelmer Vernooij <jelmer@samba.org>
Sun, 4 Sep 2005 02:01:42 +0000 (02:01 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:36:29 +0000 (13:36 -0500)
(This used to be commit ea92959209fa256a8190df19e8c27b368169724f)

source4/lib/tdr/tdr.c

index 7f42d0cf15a129e9e2e70542184fd7484fb43f9b..e1e54622acaece74d4ba67671959af85a1538a8c 100644 (file)
@@ -55,7 +55,11 @@ NTSTATUS tdr_push_expand(struct tdr_push *tdr, uint32_t size)
        }
 
        tdr->data.data = talloc_realloc(tdr, tdr->data.data, uint8_t, tdr->data.length + TDR_BASE_MARSHALL_SIZE);
-       return NT_STATUS_NO_MEMORY;
+
+       if (tdr->data.data == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       return NT_STATUS_OK;
 }