RE: [PATCH] strtok --> strsep in framebuffer drivers (part 2)

[Peter Kjellerstedt]

> -----Original Message-----
> From: Peter Wächtler [mailto:[e-mail]]
> Sent: 25 October 2001 15:36
> To: René Scharfe
> Cc: Linus Torvalds; Linux Kernel Mailing List
> Subject: Re: [PATCH] strtok --> strsep in framebuffer drivers (part 2)
> 
> René Scharfe wrote:
> > 
> > Hello,
> > 
> > I just noticed two framebuffer drivers with strtok calls 
> > that somehow passed below my radar (cscope). Patch below
> > converts them, too. And it re-adds "ignore empty tokens"
> > functionalty, which I forgot about the last time. Please apply.
> > 
> > René

[snip]

> > diff -Nur ../linux-2.4.13-pre6/drivers/video/riva/fbdev.c 
> ./drivers/video/riva/fbdev.c
> > --- ../linux-2.4.13-pre6/drivers/video/riva/fbdev.c     Tue 
> Oct 23 22:13:43 2001
> > +++ ./drivers/video/riva/fbdev.c        Tue Oct 23 23:31:33 2001
> > @@ -2046,6 +2046,8 @@
> >                 return 0;
> > 
> >         while (this_opt = strsep(&options, ",")) {
> > +               if (!*this_opt)
> > +                       continue;
> 
> NAME
>        strsep - extract token from string
> [...]
> RETURN VALUE
>        The strsep() function returns a pointer to the  token,  or
>        NULL if delim is not found in stringp.
> 
> If strsep returns NULL, and you dereference it -> Oops.
> 
> 
> ! if (!this_opt)
> 	continue;

If strsep() returns NULL, then the while-loop will terminate.
Thus this is already taken care of.

//Peter