diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-13 17:51:11 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-03-05 16:33:21 +0100 |
| commit | 952bc3cad05467959ba5aa08682d754bd80d543b (patch) | |
| tree | ec59adb15fc07fbc6c50b9eeeeb17a7dada26905 /source4/smbd/service_stream.c | |
| parent | 1f60aa8ec2e685517235aadbc11324d3b4a1a74d (diff) | |
| download | samba-952bc3cad05467959ba5aa08682d754bd80d543b.tar.gz samba-952bc3cad05467959ba5aa08682d754bd80d543b.tar.xz samba-952bc3cad05467959ba5aa08682d754bd80d543b.zip | |
Remove a number of NT_STATUS_HAVE_NO_MEMORY_AND_FREE macros from the codebase.
Following the current coding guidelines, it is considered bad practice to return from
within a macro and change control flow as they look like normal function calls.
Change-Id: I133eb5a699757ae57b87d3bd3ebbcf5b556b0268
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/smbd/service_stream.c')
| -rw-r--r-- | source4/smbd/service_stream.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index e19d0085d1..11e6deb35d 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -290,7 +290,10 @@ NTSTATUS stream_setup_socket(TALLOC_CTX *mem_ctx, } socket_address = socket_address_from_sockaddr_storage(stream_socket, &ss, port?*port:0); - NT_STATUS_HAVE_NO_MEMORY_AND_FREE(socket_address, stream_socket); + if (socket_address == NULL) { + TALLOC_FREE(stream_socket); + return NT_STATUS_NO_MEMORY; + } status = socket_create(socket_address->family, SOCKET_TYPE_STREAM, &stream_socket->sock, 0); NT_STATUS_NOT_OK_RETURN(status); |