diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-12-06 15:04:15 +1100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-12-06 15:04:15 +1100 |
| commit | bb620df7aa98c129687382e4866e643b8482fc59 (patch) | |
| tree | 86a827efa4eb50645296b1c22fac5bed270d854e | |
| parent | f1598469434ef6128320d6b0810b8f82f6aca484 (diff) | |
| download | xorg-lib-libxkbcommon-baserock/morph.tar.gz | |
Parser: Initialise geometry elements for VarDeclbaserock/morph
We were using uninitialised memory whilst parsing geometry, leaving
random contents as the return for shape/overlay/etc sections. Somehow
this actually worked everywhere but under Java.
https://bugs.freedesktop.org/show_bug.cgi?id=57913
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | src/xkbcomp/parser.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y index 28c107b..5d10a4b 100644 --- a/src/xkbcomp/parser.y +++ b/src/xkbcomp/parser.y @@ -325,9 +325,9 @@ Decl : OptMergeMode VarDecl $2->merge = $1; $$ = &$2->common; } - | OptMergeMode ShapeDecl { } - | OptMergeMode SectionDecl { } - | OptMergeMode DoodadDecl { } + | OptMergeMode ShapeDecl { $$ = NULL; } + | OptMergeMode SectionDecl { $$ = NULL; } + | OptMergeMode DoodadDecl { $$ = NULL; } | MergeMode STRING { $$ = &IncludeCreate(param->ctx, $2, $1)->common; |