Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 520401 Work around Mac ppc/gcc 4.2 compiler hang in ufn.c. r=mcs

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@258611 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.plus.com 2009-10-06 20:45:47 +00:00
parent 1f34e6c2f5
commit 3b415dda6f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/directory/c-sdk/ldap/libraries/libldap/ufn.c
View File

@ -471,8 +471,14 @@ ldap_ufn_expand( LDAP *ld, LDAP_CANCELPROC_CALLBACK *cancelproc,
if (( msgid = ldap_search( ld, dn, scope, filter, attrs,
aonly )) == -1 ) {
ldap_msgfree( tmpcand );
tmpcand = NULL;
*err = LDAP_GET_LDERRNO( ld, NULL, NULL );
return( NULL );
// Compiling with gcc-4.2 on Mac:
// gcc-4.2 -arch ppc -c -o ufn.o -gdwarf-2 -01 ufn.c
// having a return NULL statement here causes gcc to
// hang. Therefore set tmpcand to null (above) and break
// out of this loop to make gcc happy.
break;
}
tv.tv_sec = 0;
@ -499,6 +505,11 @@ ldap_ufn_expand( LDAP *ld, LDAP_CANCELPROC_CALLBACK *cancelproc,
i++;
} while ( dns != NULL && dns[i] != NULL );
// Catch the tmpcand = NULL case as required by breaking out the loop
// to prevent gcc-4.2 hanging on Mac.
if (!tmpcand)
return NULL;
if ( ldap_count_entries( ld, tmpcand ) > 0 ) {
return( tmpcand );
} else {