Hello

Thanks a lot for the patch! Will be applied on next upload (if it work
of course).

Regards,

// Ola

On Sun, Oct 23, 2005 at 05:37:03PM -0700, Markus Gutschke wrote:
> Package: xvncviewer
> Version: 3.3.7-7
> Severity: normal
> Tags: patch
> 
> 
> 
> -- System Information:
> Debian Release: testing/unstable
>   APT prefers unstable
>   APT policy: (500, 'unstable')
> Architecture: i386 (i686)
> Shell:  /bin/sh linked to /bin/bash
> Kernel: Linux 2.6.13.3
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
> 
> Versions of packages xvncviewer depends on:
> ii  dpkg                      1.13.11.0.1    package maintenance system for 
> Deb
> ii  libc6                     2.3.5-7        GNU C Library: Shared libraries 
> an
> ii  libgcc1                   1:4.0.2-2      GCC support library
> ii  libice6                   6.8.2.dfsg.1-9 Inter-Client Exchange library
> ii  libsm6                    6.8.2.dfsg.1-9 X Window System Session 
> Management
> ii  libstdc++6                4.0.2-2        The GNU Standard C++ Library v3
> ii  libx11-6                  6.8.2.dfsg.1-9 X Window System protocol client 
> li
> ii  libxaw7                   6.8.2.dfsg.1-9 X Athena widget set library
> ii  libxext6                  6.8.2.dfsg.1-9 X Window System miscellaneous 
> exte
> ii  libxmu6                   6.8.2.dfsg.1-9 X Window System miscellaneous 
> util
> ii  libxt6                    6.8.2.dfsg.1-9 X Toolkit Intrinsics
> ii  vnc-common                3.3.7-7        Virtual network computing server 
> s
> ii  xlibs                     6.8.2.dfsg.1-9 X Window System client libraries 
> m
> ii  zlib1g                    1:1.2.3-6      compression library - runtime
> 
> Versions of packages xvncviewer recommends:
> ii  xfonts-base               6.8.2.dfsg.1-9 standard fonts for X
> 
> -- no debconf information
> 
> vncviewer crashes when given the "-listen" option on the command line. This
> appears to be a problem with it trying to load a 50 pixel courier font, and
> not handling errors correctly. I attached a patch that properly handles any
> errors and then falls back on loading the "fixed" font; this appears to be
> what the original author intended to do.
> 
> 
> --- vnc-3.3.7/vncviewer/listen.c.orig   2005-10-23 17:31:25.000000000 -0700
> +++ vnc-3.3.7/vncviewer/listen.c        2005-10-23 17:24:50.000000000 -0700
> @@ -200,16 +200,20 @@ getFlashFont(Display *d)
>    char fontName[256];
>    char **fontNames;
>    int nFontNames;
> +  XFontStruct *fontInfo;
> 
>    sprintf(fontName,"-*-courier-bold-r-*-*-%d-*-*-*-*-*-iso8859-1",
>           FLASHWIDTH);
>    fontNames = XListFonts(d, fontName, 1, &nFontNames);
> -  if (nFontNames == 1) {
> -    XFreeFontNames(fontNames);
> +  fontInfo = XLoadQueryFont(d, nFontNames >= 1 ? *fontNames : "fixed");
> +  if (fontInfo != NULL) {
> +    flashFont = fontInfo->fid;
> +    XFreeFontInfo(fontNames, fontInfo, nFontNames);
>    } else {
> -    sprintf(fontName,"fixed");
> +    if (fontNames != NULL)
> +      XFreeFontNames(fontNames);
> +    flashFont = XLoadFont(d, "fixed");
>    }
> -  flashFont = XLoadFont(d, fontName);
>  }
> 
> 

-- 
 --------------------- Ola Lundqvist ---------------------------
/  [EMAIL PROTECTED]                     Annebergsslingan 37      \
|  [EMAIL PROTECTED]                 654 65 KARLSTAD          |
|  +46 (0)54-10 14 30                  +46 (0)70-332 1551       |
|  http://www.opal.dhs.org             UIN/icq: 4912500         |
\  gpg/f.p.: 7090 A92B 18FE 7994 0C36  4FE4 18A1 B1CF 0FE5 3DD9 /
 ---------------------------------------------------------------


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to