Skip to content

xnest: Check malloc return values in GCOps to avoid NULL dereferences #3637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metux merged 1 commit into from
Sep 9, 2026
Merged

xnest: Check malloc return values in GCOps to avoid NULL dereferences #3637

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions hw/xnest/GCOps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,14 @@ xnestBitBlitHelper(GCPtr pGC)
default:
{
struct xnest_event_queue *q = malloc(sizeof(struct xnest_event_queue));
q->event = event;
xorg_list_add(&q->entry, &xnestUpstreamInfo.eventQueue.entry);
if (q) {
q->event = event;
xorg_list_add(&q->entry, &xnestUpstreamInfo.eventQueue.entry);
}
else {
free(event);
}
break;
}
}
}
Expand Down Expand Up @@ -343,6 +349,8 @@ xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
// won't get more than 254 elements, since it's already processed by doPolyText()
int const bufsize = sizeof(xTextElt) + count;
uint8_t *buffer = malloc(bufsize);
if (!buffer)
return x;
xTextElt *elt = (xTextElt*)buffer;
elt->len = count;
elt->delta = 0;
Expand All @@ -369,6 +377,8 @@ xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
// won't get more than 254 elements, since it's already processed by doPolyText()
int const bufsize = sizeof(xTextElt) + count*2;
uint8_t *buffer = malloc(bufsize);
if (!buffer)
return x;
xTextElt *elt = (xTextElt*)buffer;
elt->len = count;
elt->delta = 0;
Expand Down