diff options
author | Keith Packard <keithp@keithp.com> | 2010-06-30 08:33:55 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-06-30 12:25:08 -0400 |
commit | f028e70ca714f6956e41754f132cb9b8a1e8db63 (patch) | |
tree | 1da13467a9d8f05d4eea051aa1ab1fdf6c25bdec | |
parent | 433d0851cd3e61d841ff374ee0a0f052d5907029 (diff) |
Initialize dev privates before using any
Initializing the dev privates code after allocating the server client
dev privates would cause the memory leak check to fire at server
startup or reset.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r-- | dix/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dix/main.c b/dix/main.c index 5c46dc1dc..47a932f15 100644 --- a/dix/main.c +++ b/dix/main.c @@ -184,6 +184,9 @@ int main(int argc, char *argv[], char *envp[]) clients[0] = serverClient; currentMaxClients = 1; + /* Initialize privates before first allocation */ + dixResetPrivates(); + /* Initialize server client devPrivates, to be reallocated as * more client privates are registered */ @@ -200,7 +203,6 @@ int main(int argc, char *argv[], char *envp[]) InitEvents(); InitSelections(); InitGlyphCaching(); - dixResetPrivates(); dixResetRegistry(); ResetFontPrivateIndex(); InitCallbackManager(); |