mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-05-17 17:08:07 +02:00
9e376b9f6a
Previously, when parsing multiple configuration files containing the same
section names, only the last occurrence of each section would be retained.
Earlier definitions were silently discarded due to unconditional memory
allocation and overwriting of pointers during parsing.
This resulted in incomplete or incorrect configuration state when users
intended to merge or extend configuration through multiple files.
The section parsing functions in Files.c, Flags.c, and Module.c now
accept existing section pointers. These functions allocate new memory only
if the input pointer is NULL, preserving earlier data when re-parsing.
read.c has been updated to detect and pass existing section pointers when
encountering duplicate sections across files, preventing loss of prior content.
With these changes, the parser properly accumulates and merges configuration
data across multiple files, ensuring that all relevant settings are preserved.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/467
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2045>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| Configint.h | ||
| configProcs.h | ||
| Device.c | ||
| DRI.c | ||
| Extensions.c | ||
| Files.c | ||
| Flags.c | ||
| Input.c | ||
| InputClass.c | ||
| Layout.c | ||
| meson.build | ||
| Module.c | ||
| Monitor.c | ||
| OutputClass.c | ||
| Pointer.c | ||
| read.c | ||
| scan.c | ||
| Screen.c | ||
| Vendor.c | ||
| Video.c | ||
| write.c | ||
| xf86Optrec.h | ||
| xf86Parser.h | ||
| xf86tokens.h | ||