diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-04-24 22:11:08 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-04-24 23:36:24 -0700 |
| commit | 2a5111af9e03a55bd099c6c3a5b9a7fd3dfce76f (patch) | |
| tree | feea7e93df973828a8c5d9d0a9c785695d461b2b | |
| parent | 77902e1422315963364fcba3736ff9b5b0f32d47 (diff) | |
fs_send_open_font needs to allow namelen of 0 when FontReopen is set
When _fs_load_glyphs calls fs_send_open_font with FontReopen set, it
passes a NULL name and namelen of 0, since fs_send_open_font is going
to reuse the previous name.
This overly restrictive check was added in XFree86 4.3.99.12:
http://cvsweb.xfree86.org/cvsweb/xc/lib/font/fc/fserve.c.diff?r1=3.23&r2=3.24
http://cvsweb.xfree86.org/cvsweb/xc/lib/font/fc/fserve.c?rev=3.24&content-type=text/vnd.viewcvs-markup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/fc/fserve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fc/fserve.c b/src/fc/fserve.c index 3ca3912..3585951 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -1533,7 +1533,7 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags, if (conn->blockState & FS_GIVE_UP) return BadFontName; - if (namelen <= 0 || namelen > sizeof (buf) - 1) + if (namelen < 0 || namelen > sizeof (buf) - 1) return BadFontName; /* |