mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Using a stale obj from Tcl_GetResultObj() to store error results

Browse Source 
caused incorrect data in result array and possibly segmentation
violations when searches terminated due to errors such as timeout,
exceeding search limit, or the remote server going down in the middle
of a search.  Also correctly puts error message on top of
traceback stack (instead of randomly in memory per the stale result obj).

A segmentation violation could have manifested later in the program's
life, or perhaps during termination of the interpreter.
This commit is contained in:
Randy Kunkee 2000-04-04 09:42:44 +00:00
parent 976ac15785
commit f67aea1321
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/ldaptcl/neoXldap.c
View File

@ -302,16 +302,13 @@ LDAP_PerformSearch (interp, ldaptcl, base, scope, attrs, filtpatt, value,
LDAPMessage *entryMessage = 0;
char *sortKey;
Tcl_Obj *resultObj;
int lderrno;
resultObj = Tcl_GetObjResult (interp);
sprintf(filter, filtpatt, value);
fflush(stderr);
if ((msgid = ldap_search (ldap, base, scope, filter, attrs, 0)) == -1) {
Tcl_AppendStringsToObj (resultObj,
Tcl_AppendResult (interp,
"LDAP start search error: ",
LDAP_ERR_STRING(ldap),
(char *)NULL);
@ -376,27 +373,19 @@ LDAP_PerformSearch (interp, ldaptcl, base, scope, attrs, filtpatt, value,
return tclResult;
}
if (resultCode == -1) {
Tcl_AppendStringsToObj (resultObj,
Tcl_ResetResult (interp);
Tcl_AppendResult (interp,
"LDAP result search error: ",
LDAP_ERR_STRING(ldap),
(char *)NULL);
LDAP_SetErrorCode(ldaptcl, -1, interp);
return TCL_ERROR;
}
if (resultCode == 0) {
Tcl_SetErrorCode (interp, "TIMEOUT", (char*) NULL);
Tcl_SetStringObj (resultObj, "LDAP timeout retrieving results", -1);
return TCL_ERROR;
}
/*
if (resultCode == LDAP_RES_SEARCH_RESULT ||
(all && resultCode == LDAP_RES_SEARCH_ENTRY))
return tclResult;
*/
if ((errorCode = ldap_result2error (ldap, resultMessage, 0))
!= LDAP_SUCCESS) {
Tcl_AppendStringsToObj (resultObj,
Tcl_ResetResult (interp);
Tcl_AppendResult (interp,
"LDAP search error: ",
ldap_err2string(errorCode),
(char *)NULL);