[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1291-g0241ba8

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  0241ba8ce2b6da049fb3cc512508a9e9c5732781 (commit)
      from  e971428f137dcb42e8b735386d79f1b3a6effe34 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 0241ba8ce2b6da049fb3cc512508a9e9c5732781
Author: Marc Aurele La France <tsi at ualberta.ca>
Date:   Thu Sep 10 09:52:11 2009 -0700

    Fix bug 6707 - 3.4.1 segfault in parsing configs.
    Fixes an occasional segfault caused by an out-of-bounds reference in config file parsing.
    (cherry picked from commit 7c00227f00a83345035c4c0a6716b46864f2da8d)

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/interfaces.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c
index bc6c991..b4b3800 100644
--- a/source3/lib/interfaces.c
+++ b/source3/lib/interfaces.c
@@ -156,10 +156,6 @@ static int _get_interfaces(TALLOC_CTX *mem_ctx, struct iface_struct **pifaces)
 	/* Loop through interfaces, looking for given IP address */
 	for (ifptr = iflist; ifptr != NULL; ifptr = ifptr->ifa_next) {
 
-		memset(&ifaces[total], '\0', sizeof(ifaces[total]));
-
-		copy_size = sizeof(struct sockaddr_in);
-
 		if (!ifptr->ifa_addr || !ifptr->ifa_netmask) {
 			continue;
 		}
@@ -169,6 +165,10 @@ static int _get_interfaces(TALLOC_CTX *mem_ctx, struct iface_struct **pifaces)
 			continue;
 		}
 
+		memset(&ifaces[total], '\0', sizeof(ifaces[total]));
+
+		copy_size = sizeof(struct sockaddr_in);
+
 		ifaces[total].flags = ifptr->ifa_flags;
 
 #if defined(HAVE_IPV6)


-- 
Samba Shared Repository