[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: nx-X11/3.3.0-7
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:23:29 CEST 2013
The branch, build-baikal has been updated
via 5036ffbe6500adc6f55d6b814a21f5222114ca18 (commit)
from bd433c6487a52f95e6bb949d5698dc5ea0923713 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
nx-X11/CHANGELOG | 11 +++++++++++
nx-X11/CHANGELOG.NX.original | 11 +++++++++++
nx-X11/lib/font/fontfile/encparse.c | 5 ++++-
.../{encparse.c => encparse.c.NX.original} | 5 ++++-
.../fontfile/{encparse.c => encparse.c.X.original} | 0
nx-X11/programs/Xserver/os/xprintf.c | 2 +-
nx-X11/programs/Xserver/os/xprintf.c.NX.original | 2 +-
7 files changed, 32 insertions(+), 4 deletions(-)
copy nx-X11/lib/font/fontfile/{encparse.c => encparse.c.NX.original} (99%)
copy nx-X11/lib/font/fontfile/{encparse.c => encparse.c.X.original} (100%)
The diff of changes is:
diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG
index 7b410fd..a1189c3 100644
--- a/nx-X11/CHANGELOG
+++ b/nx-X11/CHANGELOG
@@ -1,5 +1,16 @@
ChangeLog:
+nx-X11-3.3.0-7
+
+- Fixed TR08G02257. The maximum client condition was reached because
+ available fd exhausted. This bug was caused by a function in font
+ library not closing the file before a return on error breaking the
+ flow of normal execution.
+
+- Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
+ to work on more platforms. Previous implementation caused a failure
+ in the build of keyboard map on some platform like Solaris 8 and 9.
+
nx-X11-3.3.0-6
- Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
diff --git a/nx-X11/CHANGELOG.NX.original b/nx-X11/CHANGELOG.NX.original
index 7b410fd..a1189c3 100644
--- a/nx-X11/CHANGELOG.NX.original
+++ b/nx-X11/CHANGELOG.NX.original
@@ -1,5 +1,16 @@
ChangeLog:
+nx-X11-3.3.0-7
+
+- Fixed TR08G02257. The maximum client condition was reached because
+ available fd exhausted. This bug was caused by a function in font
+ library not closing the file before a return on error breaking the
+ flow of normal execution.
+
+- Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
+ to work on more platforms. Previous implementation caused a failure
+ in the build of keyboard map on some platform like Solaris 8 and 9.
+
nx-X11-3.3.0-6
- Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
diff --git a/nx-X11/lib/font/fontfile/encparse.c b/nx-X11/lib/font/fontfile/encparse.c
index 285f5a1..6262aff 100644
--- a/nx-X11/lib/font/fontfile/encparse.c
+++ b/nx-X11/lib/font/fontfile/encparse.c
@@ -867,8 +867,10 @@ FontEncReallyReallyLoad(const char *charset,
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 @@ FontEncReallyReallyLoad(const char *charset,
f = FontFileOpen(buf);
if(f == NULL) {
+ fclose(file);
return NULL;
}
encoding = parseEncodingFile(f, 0);
diff --git a/nx-X11/lib/font/fontfile/encparse.c b/nx-X11/lib/font/fontfile/encparse.c.NX.original
similarity index 99%
copy from nx-X11/lib/font/fontfile/encparse.c
copy to nx-X11/lib/font/fontfile/encparse.c.NX.original
index 285f5a1..6262aff 100644
--- a/nx-X11/lib/font/fontfile/encparse.c
+++ b/nx-X11/lib/font/fontfile/encparse.c.NX.original
@@ -867,8 +867,10 @@ FontEncReallyReallyLoad(const char *charset,
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 @@ FontEncReallyReallyLoad(const char *charset,
f = FontFileOpen(buf);
if(f == NULL) {
+ fclose(file);
return NULL;
}
encoding = parseEncodingFile(f, 0);
diff --git a/nx-X11/lib/font/fontfile/encparse.c b/nx-X11/lib/font/fontfile/encparse.c.X.original
similarity index 100%
copy from nx-X11/lib/font/fontfile/encparse.c
copy to nx-X11/lib/font/fontfile/encparse.c.X.original
diff --git a/nx-X11/programs/Xserver/os/xprintf.c b/nx-X11/programs/Xserver/os/xprintf.c
index a1ee213..54bbeef 100644
--- a/nx-X11/programs/Xserver/os/xprintf.c
+++ b/nx-X11/programs/Xserver/os/xprintf.c
@@ -43,7 +43,7 @@
# endif
#endif
-#ifdef NXAGENT_SERVER
+#ifdef NX_TRANS_SOCKET
#define PANIC
#define WARNING
diff --git a/nx-X11/programs/Xserver/os/xprintf.c.NX.original b/nx-X11/programs/Xserver/os/xprintf.c.NX.original
index a1ee213..54bbeef 100644
--- a/nx-X11/programs/Xserver/os/xprintf.c.NX.original
+++ b/nx-X11/programs/Xserver/os/xprintf.c.NX.original
@@ -43,7 +43,7 @@
# endif
#endif
-#ifdef NXAGENT_SERVER
+#ifdef NX_TRANS_SOCKET
#define PANIC
#define WARNING
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list