mi: NULL-protection in ‘miInitVisuals()
NULL-Protect just against 'vid' might remain NULL. | ../mi/micmap.c: In function ‘miInitVisuals’: | ../mi/micmap.c:505:32: warning: dereference of NULL ‘vid’ [CWE-476] [-Wanalyzer-null-dereference] | 505 | visual->vid = *vid = FakeClientID(0); | | ~~~~~^~~~~~~~~~~~~~~~~ Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
a48e2d8532
commit
fccc98645b
|
@ -34,6 +34,7 @@
|
||||||
|
|
||||||
#include "dix/colormap_priv.h"
|
#include "dix/colormap_priv.h"
|
||||||
#include "mi/mi_priv.h"
|
#include "mi/mi_priv.h"
|
||||||
|
#include "os/bug_priv.h"
|
||||||
#include "os/osdep.h"
|
#include "os/osdep.h"
|
||||||
|
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -504,7 +505,12 @@ miInitVisuals(VisualPtr * visualp, DepthPtr * depthp, int *nvisualp,
|
||||||
visual->bitsPerRGBValue = visuals->bitsPerRGB;
|
visual->bitsPerRGBValue = visuals->bitsPerRGB;
|
||||||
visual->ColormapEntries = 1 << d;
|
visual->ColormapEntries = 1 << d;
|
||||||
visual->nplanes = d;
|
visual->nplanes = d;
|
||||||
visual->vid = *vid = FakeClientID(0);
|
visual->vid = FakeClientID(0);
|
||||||
|
if (vid)
|
||||||
|
*vid = visual->vid;
|
||||||
|
else
|
||||||
|
BUG_WARN(vid == 0);
|
||||||
|
|
||||||
switch (visual->class) {
|
switch (visual->class) {
|
||||||
case PseudoColor:
|
case PseudoColor:
|
||||||
case GrayScale:
|
case GrayScale:
|
||||||
|
|
Loading…
Reference in New Issue