aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorOrion Poplawski <orion@cora.nwra.com>2015-02-09 15:58:22 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:58:22 +0100
commit4dac57f3db5b283eb419f1e108cc8510bad1b0af (patch)
tree2150b6635866fd55d457dea3acf83c3f5be9a9cc /nx-X11/programs/Xserver
parent95dbaa6149b496a6851fc6422f54dd8393217269 (diff)
downloadnx-libs-4dac57f3db5b283eb419f1e108cc8510bad1b0af.tar.gz
nx-libs-4dac57f3db5b283eb419f1e108cc8510bad1b0af.tar.bz2
nx-libs-4dac57f3db5b283eb419f1e108cc8510bad1b0af.zip
Fix -Werror=format-security errors (056_nx-X11_Werror-format-security.full.patch).
The below patch fixes more -Werror=format-security errors. Interestingly, most of the errors only showed up on our arm builds. No idea why.
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/GL/glx/glximports.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Error.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c2
-rw-r--r--nx-X11/programs/Xserver/os/log.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glximports.c b/nx-X11/programs/Xserver/GL/glx/glximports.c
index fae2346b9..435caca58 100644
--- a/nx-X11/programs/Xserver/GL/glx/glximports.c
+++ b/nx-X11/programs/Xserver/GL/glx/glximports.c
@@ -110,12 +110,12 @@ void *__glXImpRealloc(__GLcontext *gc, void *addr, size_t newSize)
void __glXImpWarning(__GLcontext *gc, char *msg)
{
- ErrorF((char *)msg);
+ ErrorF("%s",(char *)msg);
}
void __glXImpFatal(__GLcontext *gc, char *msg)
{
- ErrorF((char *)msg);
+ ErrorF("%s",(char *)msg);
__glXAbort();
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index 43bf85900..d9016436e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -232,7 +232,7 @@ static int nxagentPrintError(dpy, event, fp)
int nxagentExitHandler(const char *message)
{
- FatalError(message);
+ FatalError("%s", message);
return 0;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index a50e8a5fc..acd5d419c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -481,7 +481,7 @@ void OsVendorVErrorFFunction(const char *f, va_list args)
nxagentStartRedirectToClientsLog();
- fprintf(stderr, buffer);
+ fprintf(stderr, "%s", buffer);
nxagentEndRedirectToClientsLog();
}
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index 04e24b8df..1b28bb141 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -692,9 +692,9 @@ Error(char *str)
return;
sprintf(err, "%s: ", str);
strcat(err, strerror(saveErrno));
- LogWrite(-1, err);
+ LogWrite(-1, "%s", err);
} else
- LogWrite(-1, strerror(saveErrno));
+ LogWrite(-1, "%s", strerror(saveErrno));
}
void