o patch and test by Andrey Gusev:

  * properly replace first occurence of a pattern, resolves #10141

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@9192 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 22 insertions, 2 deletions

diff --git a/packages/base/regexpr/regexpr.pp b/packages/base/regexpr/regexpr.pp
index 6e4cffb5eb..9dd7ea14bf 100644
--- a/packages/base/regexpr/regexpr.pp
+++ b/packages/base/regexpr/regexpr.pp
@@ -1,3 +1,5 @@
+{ $DEFINE DEBUG}
+
 {
     This unit implements basic regular expression support
 
@@ -1122,7 +1124,7 @@ unit regexpr;
       oldlength : PtrInt;
     begin
       pos:=pchar(src);
-      lastpos:=pos;
+      lastpos:=nil;
       first:=true;
       Result:=0;
       { estimate some length }
@@ -1130,8 +1132,9 @@ unit regexpr;
       while RegExprPos(RegExprEngine,pos,index,len) do
         begin
           inc(pos,index);
-          if pos>lastpos then
+          if (lastpos = nil) or (pos>lastpos) then
             begin
+              if lastpos = nil then lastpos := pchar(src);
               { copy skipped part }
 
               { because we cheat with SetLength a SetLength(...,0) isn't what we want
diff --git a/packages/base/regexpr/testreg1.pp b/packages/base/regexpr/testreg1.pp
index 3ba2604dd1..ff06360ddb 100644
--- a/packages/base/regexpr/testreg1.pp
+++ b/packages/base/regexpr/testreg1.pp
@@ -856,5 +856,22 @@ begin
     (Dest<>'asdasdasdasd') then
     do_error(2009);
   DestroyregExprEngine(r);
+
+  initok:=GenerateRegExprEngine('fa',[],r);
+  if not initok then
+    do_error(2000);
+  if (RegExprReplaceAll(r,'fasdfasdf','',Dest)<>2) or
+    (Dest<>'sdsdf') then
+    do_error(2010);
+  DestroyregExprEngine(r);
+
+  initok:=GenerateRegExprEngine('fa',[],r);
+  if not initok then
+    do_error(2011);
+  if (RegExprReplaceAll(r,'fasdfafaasdasdfafaasd','',Dest)<>5) or
+    (Dest<>'sdasdasdasd') then
+    do_error(2012);
+  DestroyregExprEngine(r);
+
    writeln('*** Testing unit regexpr was successful ***');
 end.