better [PATCH] segfault fix while formatting paragraph (alt-p)

[Jindrich Novy <jnovy redhat com>]

Hi,

after some refinement I'm sending a better patch that rewrites
next_word_start() and fixes the segfault.

Jindrich

--- mc/edit/wordproc.c.jn	2005-05-27 05:35:12.000000000 +0200
+++ mc/edit/wordproc.c	2006-06-16 18:48:42.000000000 +0200
@@ -198,33 +198,25 @@
 }
 
 static int
-next_word_start (unsigned char *t, int q)
+next_word_start (unsigned char *t, int q, int size)
 {
     int i;
-    for (i = q;; i++) {
-	switch (t[i]) {
-	case '\n':
+    for (i = q; i<size; i++) {
+	if ( t[i] == '\n')
 	    return -1;
-	case '\t':
-	case ' ':
-	    for (;; i++) {
-		if (t[i] == '\n')
-		    return -1;
-		if (t[i] != ' ' && t[i] != '\t')
-		    return i;
-	    }
-	    break;
-	}
+	if ( t[i] != ' ' && t[i] != '\t')
+	    return i;
     }
+    return -1;
 }
 
 /* find the start of a word */
 static int
-word_start (unsigned char *t, int q)
+word_start (unsigned char *t, int q, int size)
 {
     int i = q;
     if (t[q] == ' ' || t[q] == '\t')
-	return next_word_start (t, q);
+	return next_word_start (t, q, size);
     for (;;) {
 	int c;
 	if (!i)
@@ -253,9 +245,9 @@
 	    break;
 	if (t[q] == '\n')
 	    break;
-	p = word_start (t, q);
+	p = word_start (t, q, size);
 	if (p == -1)
-	    q = next_word_start (t, q);		/* Return the end of the word if the beginning
+	    q = next_word_start (t, q, size);	/* Return the end of the word if the beginning
 						   of the word is at the beginning of a line
 						   (i.e. a very long word) */
 	else