From e38ce9a3a6b73898e2136838a311c09378cdc189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Tue, 30 Oct 2001 11:50:44 +0100 Subject: [PATCH] Fix for [bug 2433]. Rev: src/builtin_functions.c:1.410 --- src/builtin_functions.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/builtin_functions.c b/src/builtin_functions.c index 72adecce3e..e4d61476aa 100644 --- a/src/builtin_functions.c +++ b/src/builtin_functions.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: builtin_functions.c,v 1.409 2001/10/28 18:04:06 nilsson Exp $"); +RCSID("$Id: builtin_functions.c,v 1.410 2001/10/30 10:50:44 grubba Exp $"); #include "interpret.h" #include "svalue.h" #include "pike_macros.h" @@ -597,9 +597,12 @@ PMOD_EXPORT void f_search(INT32 args) "length of the string.\n"); if(Pike_sp[1-args].type == T_STRING) { - start = string_search(haystack, - Pike_sp[1-args].u.string, - start); + /* Handle searching for the empty string. */ + if (Pike_sp[1-args].u.string->len) { + start = string_search(haystack, + Pike_sp[1-args].u.string, + start); + } } else if (Pike_sp[1-args].type == T_INT) { INT_TYPE val = Pike_sp[1-args].u.integer; -- GitLab