aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 14:14:26 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 14:18:50 +0100
commit1e5ee575d4912665dd2356681f0827d5229fa1f5 (patch)
tree31db7768b2686507a5f9ea2ffa03d9c62ccf78c9 /doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch
parent1fd8551f1632efbc2655c9293087bba08cf2f0c9 (diff)
downloadnx-libs-1e5ee575d4912665dd2356681f0827d5229fa1f5.tar.gz
nx-libs-1e5ee575d4912665dd2356681f0827d5229fa1f5.tar.bz2
nx-libs-1e5ee575d4912665dd2356681f0827d5229fa1f5.zip
nx-X11 vs. X.Org 6.9 patches for further studying / documentation
NoMachine kept all original X.Org 6.9 files in the nx-X11 source tree. These files have been removed in Feb 2015 during a major code cleanup. For later studying we provide all diffs of the changes that NoMachine employed on the original X.Org X11 code tree in the doc/nx-X11_vs_XOrg69_patches folder.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch
new file mode 100644
index 000000000..116badc07
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/encparse.c.NX.patch
@@ -0,0 +1,22 @@
+--- ./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);