Skip to content

N
nx-libs
Commit 082e8313 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Revert "Add a couple fixups for the security patches"

This reverts commit b092864a39bbcd4f34c5c26a7cd0df90e235815d. We will use the proper libX11 upstream patches now.
parent e15023b2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
nx-X11/lib/X11/Font.c
View file @ 082e8313
...@@ -508,7 +508,6 @@ _XF86BigfontQueryFont ( ...@@ -508,7 +508,6 @@ _XF86BigfontQueryFont (
any real font needs, so the combined total doesn't overflow either */ any real font needs, so the combined total doesn't overflow either */
if (reply.nUniqCharInfos > ((ULONG_MAX / 2) / SIZEOF(xCharInfo)) || if (reply.nUniqCharInfos > ((ULONG_MAX / 2) / SIZEOF(xCharInfo)) ||
reply.nCharInfos > ((ULONG_MAX / 2) / sizeof(CARD16))) { reply.nCharInfos > ((ULONG_MAX / 2) / sizeof(CARD16))) {
Xfree(fs->properties);
Xfree((char *) fs); Xfree((char *) fs);
_XEatDataWords(dpy, reply_left); _XEatDataWords(dpy, reply_left);
return (XFontStruct *)NULL; return (XFontStruct *)NULL;
......
nx-X11/lib/X11/XKBGetMap.c
View file @ 082e8313
...@@ -427,7 +427,7 @@ XkbServerMapPtr srv; ...@@ -427,7 +427,7 @@ XkbServerMapPtr srv;
if ( rep->totalVModMapKeys>0 ) { if ( rep->totalVModMapKeys>0 ) {
if (((int) rep->firstVModMapKey + rep->nVModMapKeys) if (((int) rep->firstVModMapKey + rep->nVModMapKeys)
> xkb->max_key_code + 1) > xkb->max_key_code)
return BadLength; return BadLength;
if (((xkb->server==NULL)||(xkb->server->vmodmap==NULL))&& if (((xkb->server==NULL)||(xkb->server->vmodmap==NULL))&&
(XkbAllocServerMap(xkb,XkbVirtualModMapMask,0)!=Success)) { (XkbAllocServerMap(xkb,XkbVirtualModMapMask,0)!=Success)) {
......
nx-X11/lib/X11/XKBNames.c
View file @ 082e8313
...@@ -180,7 +180,7 @@ _XkbReadGetNamesReply( Display * dpy, ...@@ -180,7 +180,7 @@ _XkbReadGetNamesReply( Display * dpy,
nKeys= xkb->max_key_code+1; nKeys= xkb->max_key_code+1;
names->keys= _XkbTypedCalloc(nKeys,XkbKeyNameRec); names->keys= _XkbTypedCalloc(nKeys,XkbKeyNameRec);
} }
else if ( ((int)rep->firstKey + rep->nKeys) > xkb->max_key_code + 1) else if ( ((int)rep->firstKey + rep->nKeys) > xkb->max_key_code)
goto BAILOUT; goto BAILOUT;
if (names->keys!=NULL) { if (names->keys!=NULL) {
if (!_XkbCopyFromReadBuffer(&buf, if (!_XkbCopyFromReadBuffer(&buf,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment