diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
| commit | 8654ee514b4d79feec936501717a06892090d3b7 (patch) | |
| tree | 2787608c117268bc6ed9e399ea57b8e1d0aeb8e3 /xorg-server/dix | |
| parent | eb405babefc73e25ab8b7e6229709f85ef6a67b1 (diff) | |
| download | vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.gz vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.bz2 vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.zip | |
svn merge -r530:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/extension.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/dix/extension.c b/xorg-server/dix/extension.c index fb83af148..f34866586 100644 --- a/xorg-server/dix/extension.c +++ b/xorg-server/dix/extension.c @@ -83,8 +83,11 @@ AddExtension(char *name, int NumEvents, int NumErrors, if (!MainProc || !SwappedMainProc || !MinorOpcodeProc) return((ExtensionEntry *) NULL); if ((lastEvent + NumEvents > LAST_EVENT) || - (unsigned)(lastError + NumErrors > LAST_ERROR)) + (unsigned)(lastError + NumErrors > LAST_ERROR)) { + LogMessage(X_ERROR, "Not enabling extension %s: maximum number of " + "events or errors exceeded.\n", name); return((ExtensionEntry *) NULL); + } ext = xalloc(sizeof(ExtensionEntry)); if (!ext) |