[PATCH 1/1] Fix handling of invalid, non-path FPE

[Ademar de Souza Reis Jr.]

This patch is important because a catalogue:<dir> config entry on
a xfs linked with a libXfont w/out support for this feature will
fail with a fatal error instead of just ignoring it.

As a simple testcase, one can add a bogus 'foobar' as the first
entry in the catalogues list. Without the patch, xfs will fail to
start instead of just ignoring the bogus entry.

Cheers,
  - Ademar

On Wed, Jun 20, 2007 at 04:48:26PM -0300, Ademar de Souza Reis Jr wrote:
> FPE's which are not valid and are not in the form of paths cause a
> failure on the parser which invalidates all subsequent FPEs. If
> the invalid FPE is the first on the list, this will cause a
> fatal-error and the server will abort.
> ---
>  difs/fonts.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/difs/fonts.c b/difs/fonts.c
> index 2ba7c42..05fef26 100644
> --- a/difs/fonts.c
> +++ b/difs/fonts.c
> @@ -688,6 +688,7 @@ set_font_path_elements(
>  	    {
>  		NoticeF("ignoring font path element %s (bad font path descriptor)\n", name);
>  		fsfree(name);
> +		cp += len;
>  		continue;
>  	    }
>  	    /* must be new -- make it */
> -- 
> 1.5.2.1

-- 
Ademar de Souza Reis Jr.
Mandriva - http://www.mandriva.com.br

^[:wq!