summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2005-12-09 14:13:00 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2005-12-09 14:13:00 (GMT)
commit4fdc73733207bd69ff17bc8c150e026e35accb5b (patch)
treec9b1f7c208357166b5f3fd3a3785d43c70f45f3b /generic
parent9a0b2f10b4c17659126642ca9fd595b75464d292 (diff)
downloadtcl-4fdc73733207bd69ff17bc8c150e026e35accb5b.zip
tcl-4fdc73733207bd69ff17bc8c150e026e35accb5b.tar.gz
tcl-4fdc73733207bd69ff17bc8c150e026e35accb5b.tar.bz2
Fix [Bug 1374778]
Diffstat (limited to 'generic')
-rw-r--r--generic/tclCmdIL.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 4c83b5f..e61a42d 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -16,7 +16,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCmdIL.c,v 1.85 2005/11/29 10:32:56 dkf Exp $
+ * RCS: @(#) $Id: tclCmdIL.c,v 1.86 2005/12/09 14:13:00 dkf Exp $
*/
#include "tclInt.h"
@@ -3454,12 +3454,26 @@ Tcl_LsearchObjCmd(clientData, interp, objc, objv)
}
return result;
}
- if (offset > listc-1) {
- offset = listc-1;
- }
if (offset < 0) {
offset = 0;
}
+
+ /*
+ * If the search started past the end of the list, we just return a
+ * "did not match anything at all" result straight away. [Bug 1374778]
+ */
+
+ if (offset > listc-1) {
+ if (sortInfo.indexc > 1) {
+ ckfree((char *) sortInfo.indexv);
+ }
+ if (allMatches || inlineReturn) {
+ Tcl_ResetResult(interp);
+ } else {
+ Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
+ }
+ return TCL_OK;
+ }
}
patObj = objv[objc - 1];