frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

record: protect from NULL pointers 

Even though the situation probably never happens, but better being extra
cautious, just in case.

| ../record/set.c: In function ‘IntervalListCreateSet’:
| ../record/set.c:364:5: warning: use of NULL ‘stackIntervals’ where non-null expected [CWE-476] [-Wanalyzer-null-argument]
|   364 |     memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval));
|       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-06 16:28:19 +02:00
parent 2be4669988
commit f1e7e52aa3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
record/record.c
View File

@ -888,6 +888,7 @@ RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
unsigned int j; unsigned int j;
for (j = interval.first; j <= interval.last; j++) for (j = interval.first; j <= interval.last; j++)
if (pClient)
pClient->requestVector[j] = RecordARequest; pClient->requestVector[j] = RecordARequest;
} }
} }

1
record/set.c
View File

@ -361,6 +361,7 @@ IntervalListCreateSet(RecordSetInterval * pIntervals, int nIntervals,
goto bailout; goto bailout;
prls->baseSet.ops = &IntervalListSetOperations; prls->baseSet.ops = &IntervalListSetOperations;
} }
if (stackIntervals)
memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval)); memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval));
prls->nIntervals = nIntervals; prls->nIntervals = nIntervals;
bailout: bailout: