diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
| commit | d14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch) | |
| tree | 28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_font_fontfile_encparse.c.X.original | |
| parent | 74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff) | |
| download | nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2 nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip | |
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_font_fontfile_encparse.c.X.original')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_font_fontfile_encparse.c.X.original | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_font_fontfile_encparse.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_font_fontfile_encparse.c.X.original deleted file mode 100644 index 116badc07..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_font_fontfile_encparse.c.X.original +++ /dev/null @@ -1,22 +0,0 @@ ---- ./nx-X11/lib/font/fontfile/encparse.c.X.original 2015-02-13 14:03:44.668443005 +0100 -+++ ./nx-X11/lib/font/fontfile/encparse.c 2015-02-10 19:13:12.336740907 +0100 -@@ -867,8 +867,10 @@ - if(!strcasecmp(encoding_name, charset)) { - /* Found it */ - if(file_name[0] != '/') { -- if(strlen(dir) + strlen(file_name) >= MAXFONTFILENAMELEN) -+ if(strlen(dir) + strlen(file_name) >= MAXFONTFILENAMELEN) { -+ fclose(file); - return NULL; -+ } - strcpy(buf, dir); - strcat(buf, file_name); - } else { -@@ -877,6 +879,7 @@ - - f = FontFileOpen(buf); - if(f == NULL) { -+ fclose(file); - return NULL; - } - encoding = parseEncodingFile(f, 0); |