diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-12-03 09:34:05 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-12-03 09:34:05 +0000 |
| commit | 7d9275c76308671d60e0601d05989d4da858e0c2 (patch) | |
| tree | 07f6128569a6fddd735927742389eff93b22240b /xserver/glamor | |
| parent | d941a4434d51355841372e7114d88f1a35f12088 (diff) | |
don't free uninitialised pointers in glamor
Attempting to run fvwm on a x61/965gm with xserver 1.21.1 with the
modesetting driver on amd64 would cause the xserver to
reliably crash.
problem introduced upstream in
2906ee5e4 ("glamor: Fix leak in glamor_build_program()")
which was backported to the 1.21 branch.
ok matthieu@
Diffstat (limited to 'xserver/glamor')
| -rw-r--r-- | xserver/glamor/glamor_program.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xserver/glamor/glamor_program.c b/xserver/glamor/glamor_program.c index c51577fc3..d8ddb4c77 100644 --- a/xserver/glamor/glamor_program.c +++ b/xserver/glamor/glamor_program.c @@ -260,8 +260,8 @@ glamor_build_program(ScreenPtr screen, char *fs_vars = NULL; char *vs_vars = NULL; - char *vs_prog_string; - char *fs_prog_string; + char *vs_prog_string = NULL; + char *fs_prog_string = NULL; GLint fs_prog, vs_prog; Bool gpu_shader4 = FALSE; |