diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 20:27:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 20:27:26 +0200 |
| commit | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (patch) | |
| tree | a88d66b3d34f8e008f08e2bd77889c6c6718ab11 /libX11/modules | |
| parent | 0b3be550b20ad9f991f77bf979b2c306a7d4ef11 (diff) | |
| download | vcxsrv-e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f.tar.gz vcxsrv-e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f.tar.bz2 vcxsrv-e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f.zip | |
fontconfig libX11 libxcb xcb-proto mesa pixman xserver xkeyboard-config git update 15 June 2015release/external
xserver commit fa12f2c150b2f50de9dac4a2b09265f13af353af
libxcb commit f85661c3bca97faa72431df92a3867be39a74e23
libxcb/xcb-proto commit fef8a4cdc2cacd9541a656026371a3d338dadb8e
xkeyboard-config commit 61fb58a95a071cc1c212f6d3808908c086219fe0
libX11 commit f0286b2770ece10aef5e2e8c004260217f12fd25
pixman commit eebc1b78200aff075dbcae9c8d00edad1f830d91
fontconfig commit f6d61c9beed856a925bd60c025b55284b2d88161
mesa commit 932d1613d1e15ec22555e5ec09105c49eb850e36
Diffstat (limited to 'libX11/modules')
| -rw-r--r-- | libX11/modules/im/ximcp/imLcPrs.c | 6 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omGeneric.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libX11/modules/im/ximcp/imLcPrs.c b/libX11/modules/im/ximcp/imLcPrs.c index 9bb45ff31..60215c706 100644 --- a/libX11/modules/im/ximcp/imLcPrs.c +++ b/libX11/modules/im/ximcp/imLcPrs.c @@ -496,12 +496,12 @@ parseline( token = nexttoken(fp, tokenbuf, &lastch); if (token != KEY && token != STRING) goto error; - if ((filename = TransFileName(im, tokenbuf)) == NULL) - goto error; if (++depth > 100) goto error; + if ((filename = TransFileName(im, tokenbuf)) == NULL) + goto error; infp = _XFopenFile(filename, "r"); - Xfree(filename); + Xfree(filename); if (infp == NULL) goto error; parsestringfile(infp, im, depth); diff --git a/libX11/modules/om/generic/omGeneric.c b/libX11/modules/om/generic/omGeneric.c index a835f00d7..53ca75c04 100644 --- a/libX11/modules/om/generic/omGeneric.c +++ b/libX11/modules/om/generic/omGeneric.c @@ -105,7 +105,7 @@ init_fontdata( if(fd == (FontData) NULL) return False; - memset(fd, 0x00, sizeof(FontData) * font_data_count); + memset(fd, 0x00, sizeof(FontDataRec) * font_data_count); for(i = 0 ; i < font_data_count ; i++) fd[i] = font_data[i]; |