X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3c5a620c3c3ace18bf7981b886e49c484931a4fc..ed47c4e229a954f303dea4b277efb19f08c69866:/minibidi.c

diff --git a/minibidi.c b/minibidi.c
index 9943ae39..717dd57b 100644
--- a/minibidi.c
+++ b/minibidi.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * $Id: minibidi.c,v 1.1 2004/05/22 10:36:50 simon Exp $
+ * $Id$
  *
  * ------------
  * Description:
@@ -14,9 +14,9 @@
  * -----------------
  * Revision Details:    (Updated by Revision Control System)
  * -----------------
- *  $Date: 2004/05/22 10:36:50 $
- *  $Author: simon $
- *  $Revision: 1.1 $
+ *  $Date$
+ *  $Author$
+ *  $Revision$
  *  $Source: /u1/simon/svn-migration/cvs/putty/minibidi.c,v $
  *
  * (www.arabeyes.org - under MIT license)
@@ -55,7 +55,7 @@ void flipThisRun(bidi_char *from, unsigned char *level, int max, int count)
 	tlevel = max;
 	i = j = findIndexOfRun(level, i, count, max);
 	/* find the end of the run */
-	while(tlevel <= level[i] && i<count)
+	while(i<count && tlevel <= level[i])
 	{
 	    i++;
 	}
@@ -711,7 +711,8 @@ int do_bidi(bidi_char *line, int count)
 	    {
 		j++;
 	    }
-	    if(getType(line[j].wc) == B || getType(line[j].wc) == S)
+	    if(j==count || getType(line[j].wc) == B ||
+	       getType(line[j].wc) == S)
 	    {
 		for(j--; j>=i ; j--)
 		{