Files
xserver/hw/xfree86/parser/Files.c
callmetango cd81282968 config: Preserve section data when parsing duplicate files
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.

Backport from Xorg.

References:
https://gitlab.freedesktop.org/xorg/xserver/-/issues/467
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2045

Fixes: #279
Signed-off-by: callmetango <callmetango@users.noreply.github.com>
2025-07-30 16:44:58 +02:00

241 lines
7.8 KiB
C

/*
* Copyright (c) 1997 Metro Link Incorporated
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* Except as contained in this notice, the name of the Metro Link shall not be
* used in advertising or otherwise to promote the sale, use or other dealings
* in this Software without prior written authorization from Metro Link.
*
*/
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of the copyright holder(s)
* and author(s) shall not be used in advertising or otherwise to promote
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <assert.h>
#include <X11/Xos.h>
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
static const xf86ConfigSymTabRec FilesTab[] = {
{ENDSECTION, "endsection"},
{FONTPATH, "fontpath"},
{MODULEPATH, "modulepath"},
{LOGFILEPATH, "logfile"},
{XKBDIR, "xkbdir"},
/* Obsolete keywords that aren't used but shouldn't cause errors: */
{OBSOLETE_TOKEN, "rgbpath"},
{OBSOLETE_TOKEN, "inputdevices"},
{-1, ""},
};
#define CLEANUP xf86freeFiles
XF86ConfFilesPtr
xf86parseFilesSection(XF86ConfFilesPtr ptr)
{
int i, j;
int k, l;
char *str;
int token;
if (ptr == NULL)
{
if((ptr=calloc(1, sizeof(XF86ConfFilesRec))) == NULL)
{
return NULL;
}
}
while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
switch (token) {
case COMMENT:
ptr->file_comment = xf86addComment(ptr->file_comment, xf86_lex_val.str);
free(xf86_lex_val.str);
xf86_lex_val.str = NULL;
break;
case FONTPATH:
if (xf86getSubToken(&(ptr->file_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "FontPath");
j = FALSE;
str = xf86_lex_val.str;
if (ptr->file_fontpath == NULL) {
ptr->file_fontpath = calloc(1, 1);
i = strlen(str) + 1;
}
else {
i = strlen(ptr->file_fontpath) + strlen(str) + 1;
if (ptr->file_fontpath[strlen(ptr->file_fontpath) - 1] != ',') {
i++;
j = TRUE;
}
}
ptr->file_fontpath = realloc(ptr->file_fontpath, i);
assert(ptr->file_fontpath);
if (j)
strcat(ptr->file_fontpath, ",");
strcat(ptr->file_fontpath, str);
free(xf86_lex_val.str);
break;
case MODULEPATH:
if (xf86getSubToken(&(ptr->file_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "ModulePath");
l = FALSE;
str = xf86_lex_val.str;
if (ptr->file_modulepath == NULL) {
ptr->file_modulepath = calloc(1, 1);
assert(ptr->file_modulepath);
ptr->file_modulepath[0] = '\0';
k = strlen(str) + 1;
}
else {
k = strlen(ptr->file_modulepath) + strlen(str) + 1;
if (ptr->file_modulepath[strlen(ptr->file_modulepath) - 1] !=
',') {
k++;
l = TRUE;
}
}
ptr->file_modulepath = realloc(ptr->file_modulepath, k);
assert(ptr->file_modulepath);
if (l)
strcat(ptr->file_modulepath, ",");
strcat(ptr->file_modulepath, str);
free(xf86_lex_val.str);
break;
case LOGFILEPATH:
if (xf86getSubToken(&(ptr->file_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "LogFile");
ptr->file_logfile = xf86_lex_val.str;
break;
case XKBDIR:
if (xf86getSubToken(&(ptr->file_xkbdir)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "XkbDir");
ptr->file_xkbdir = xf86_lex_val.str;
break;
case EOF_TOKEN:
Error(UNEXPECTED_EOF_MSG);
break;
case OBSOLETE_TOKEN:
xf86parseError(OBSOLETE_MSG, xf86tokenString());
xf86getSubToken(&(ptr->file_comment));
break;
default:
Error(INVALID_KEYWORD_MSG, xf86tokenString());
break;
}
}
#ifdef DEBUG
printf("File section parsed\n");
#endif
return ptr;
}
#undef CLEANUP
void
xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr)
{
char *p, *s;
if (ptr == NULL)
return;
if (ptr->file_comment)
fprintf(cf, "%s", ptr->file_comment);
if (ptr->file_logfile)
fprintf(cf, "\tLogFile \"%s\"\n", ptr->file_logfile);
if (ptr->file_modulepath) {
s = ptr->file_modulepath;
p = index(s, ',');
while (p) {
*p = '\000';
fprintf(cf, "\tModulePath \"%s\"\n", s);
*p = ',';
s = p;
s++;
p = index(s, ',');
}
fprintf(cf, "\tModulePath \"%s\"\n", s);
}
if (ptr->file_fontpath) {
s = ptr->file_fontpath;
p = index(s, ',');
while (p) {
*p = '\000';
fprintf(cf, "\tFontPath \"%s\"\n", s);
*p = ',';
s = p;
s++;
p = index(s, ',');
}
fprintf(cf, "\tFontPath \"%s\"\n", s);
}
if (ptr->file_xkbdir)
fprintf(cf, "\tXkbDir \"%s\"\n", ptr->file_xkbdir);
}
void
xf86freeFiles(XF86ConfFilesPtr p)
{
if (p == NULL)
return;
TestFree(p->file_logfile);
TestFree(p->file_modulepath);
TestFree(p->file_fontpath);
TestFree(p->file_comment);
TestFree(p->file_xkbdir);
free(p);
}