From 5e80471b2da82d3e23a64ee4db65c4f5be9edd2d Mon Sep 17 00:00:00 2001
From: Eddie Runia <eddie@runia.com>
Date: Sat, 22 May 1999 14:43:40 +0000
Subject: [PATCH] See changelog. Thanks to Les

---
 harbour/ChangeLog               | 4 ++++
 harbour/source/vm/hvm.c         | 6 ++----
 harbour/tests/working/instr.prg | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 95fa9a171d..be2953612c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+19990522-15:35 CET Eddie Runia
+  * tests/working/instr.prg, source/vm/hvm.c
+    Les Griffiths patch inserted
+
 19990522-15:10 CET Eddie Runia
   * include/test.ch
     added
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index dd63c6c411..a6935115f6 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -1058,13 +1058,11 @@ void Instring( void )
    PITEM pItem1 = stack.pPos - 2;
    PITEM pItem2 = stack.pPos - 1;
    int   iResult;
-   ULONG ul;
 
    if( IS_STRING( pItem1 ) && IS_STRING( pItem2 ) )
    {
-      for( iResult = 0, ul = 0; !iResult && ul < (ULONG) pItem1->wLength; ul++ )
-         iResult = hb_strAt( pItem1->value.szText + ul, 1,
-                             pItem2->value.szText, pItem2->wLength );
+      iResult = hb_strAt( pItem1->value.szText, pItem1->wLength,
+                          pItem2->value.szText, pItem2->wLength );
       StackPop();
       StackPop();
       PushLogical( iResult == 0 ? 0 : 1 );
diff --git a/harbour/tests/working/instr.prg b/harbour/tests/working/instr.prg
index eaffcb06f9..a12df69157 100644
--- a/harbour/tests/working/instr.prg
+++ b/harbour/tests/working/instr.prg
@@ -11,7 +11,7 @@ qout('"d" $ "BCDE" ', "d" $ "BCDE",.f.)
 qout('"D" $ "bcde" ', "D" $ "bcde",.f.)
 
 qout('"de" $ "bcde"', "de" $ "bcde",.t.)
-qout('"bd" $ "bcde"', "bd" $ "bcde",.t.)
+qout('"bd" $ "bcde"', "bd" $ "bcde",.f.)
 qout('"BD" $ "bcde"', "BD" $ "bcde",.f.)
 
 return nil