libXfont: Changes to 'master'

[Matthieu Herrb]

 src/FreeType/ftfuncs.c |    2 +-
 src/bitmap/pcfread.c   |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 43d587d89bee679850bb18ff25aa77c961712728
Author: Olli Vertanen <olli.vertanen at symbio.com>
Date:   Tue Sep 6 19:00:55 2011 +0000

    libxfont: An uninitialized pointer causes a crash if pcf header is corrupted.
    
    If pcfReadTOC() or pcfGetProperties() fail in the beginning
    of execution of pcfReadFont(), function tries to free an
    uninitialized pointer (isStringProp) when bailing out.
    
    The pointer gets now initialized correctly.
    
    Signed-off-by: Olli Vertanen <olli.vertanen at symbio.com>
    Reviewed-by: Rami Ylimäki <rami.ylimaki at vincit.fi>

commit 73e6c94a351c891ed85446df84c9a30a4224f478
Author: Joerg Sonnenberger <joerg at britannica.bec.de>
Date:   Sun Aug 21 19:07:51 2011 +0200

    Fix empty statement in if conditional.
    
    Assume for a moment that the intention here is to do
    something useful.
    
    Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>