Attachment 145333 Details for Bug 221406 – Make sure fts_cur is always valid after return from fts_read ()

[patch] Make sure fts_cur is always valid after return from fts_read ()

fts-fixes.patch (text/plain), 956 bytes, created by Miloslav Trmač on 2007-01-11 11:37:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2007-01-11 11:37:31 UTC

Size: 956 bytes

patch

obsolete

>--- slocate/sl_fts.c	2007-01-10 07:45:51.000000000 +0100
>+++ slocate-2.7/sl_fts.c	2007-01-10 07:55:10.000000000 +0100
>@@ -371,12 +371,14 @@
> 		}
> 		p = sp->fts_child;
> 		sp->fts_child = NULL;
>+		sp->fts_cur = p;
> 		goto name;
> 	}
> 
> 	/* Move to the next node on this level. */
> next:	tmp = p;
> 	if ((p = p->fts_link) != NULL) {
>+		sp->fts_cur = p;
> 		free(tmp);
> 
> 		/*
>@@ -389,7 +391,7 @@
> 				return (NULL);
> 			}
> 			fts_load(sp, p);
>-			return (sp->fts_cur = p);
>+			return p;
> 		}
> 
> 		/*
>@@ -415,11 +417,12 @@
> name:		t = sp->fts_path + NAPPEND(p->fts_parent);
> 		*t++ = '/';
> 		memmove(t, p->fts_name, p->fts_namelen + 1);
>-		return (sp->fts_cur = p);
>+		return p;
> 	}
> 
> 	/* Move up to the parent node. */
> 	p = tmp->fts_parent;
>+	sp->fts_cur = p;
> 	free(tmp);
> 
> 	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
>@@ -460,7 +463,7 @@
> 		return (NULL);
> 	}
> 	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
>-	return (sp->fts_cur = p);
>+	return p;
> }
> 
> /*

Actions: View | Diff

Attachments on bug 221406: 144891 | 145143 | 145144 | 145145 | 145246 | 145331 | 145333