svn commit: samba r14307 - in branches/SAMBA_4_0/source/lib/socket:
.
tridge at samba.org
tridge at samba.org
Mon Mar 13 06:57:20 GMT 2006
Author: tridge
Date: 2006-03-13 06:57:11 +0000 (Mon, 13 Mar 2006)
New Revision: 14307
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14307
Log:
fixed dereference of my_address->addr when NULL
Modified:
branches/SAMBA_4_0/source/lib/socket/socket_unix.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket/socket_unix.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/socket_unix.c 2006-03-13 06:56:31 UTC (rev 14306)
+++ branches/SAMBA_4_0/source/lib/socket/socket_unix.c 2006-03-13 06:57:11 UTC (rev 14307)
@@ -134,10 +134,11 @@
unlink(my_address->addr);
}
- if (my_address && my_address->sockaddr) {
+ if (my_address->sockaddr) {
ret = bind(sock->fd, (struct sockaddr *)&my_addr, sizeof(my_addr));
+ } else if (my_address->addr == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
} else {
-
if (strlen(my_address->addr)+1 > sizeof(my_addr.sun_path)) {
return NT_STATUS_OBJECT_PATH_INVALID;
}
More information about the samba-cvs
mailing list