aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/loader/dlloader.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
commit2553bdd7c359cd87525d367761c86932cec5adff (patch)
treeae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/loader/dlloader.c
parente2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff)
parent4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff)
downloadvcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/loader/dlloader.c')
-rw-r--r--xorg-server/hw/xfree86/loader/dlloader.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/loader/dlloader.c b/xorg-server/hw/xfree86/loader/dlloader.c
index 4caefd071..18dcb76c6 100644
--- a/xorg-server/hw/xfree86/loader/dlloader.c
+++ b/xorg-server/hw/xfree86/loader/dlloader.c
@@ -87,16 +87,15 @@ DLFindSymbolLocal(pointer module, const char *name)
static const char symPrefix[] = DLSYM_PREFIX;
- if (strlen(symPrefix)) {
+ if (sizeof(symPrefix) > 1) {
n = malloc(strlen(symPrefix) + strlen(name) + 1);
sprintf(n, "%s%s", symPrefix, name);
- } else {
- n = name;
+ name = n;
}
- p = dlsym(module, n);
+ p = dlsym(module, name);
- if (strlen(symPrefix))
+ if (sizeof(symPrefix) > 1)
free(n);
return p;