sync with OpenBSD -current
This commit is contained in:
parent
81739016d9
commit
48226b7c51
178 changed files with 76551 additions and 36405 deletions
|
@ -172,7 +172,6 @@ CC = @CC@
|
|||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
|
|
|
@ -171,7 +171,7 @@ Status XeviGetVisualInfo(
|
|||
sz_xInfo = rep.n_info * sz_xExtendedVisualInfo;
|
||||
sz_conflict = rep.n_conflicts * sizeof(VisualID);
|
||||
sz_xConflict = rep.n_conflicts * sz_VisualID32;
|
||||
*evi_return = Xcalloc(sz_info + sz_conflict, 1);
|
||||
*evi_return = Xcalloc(1, sz_info + sz_conflict);
|
||||
temp_xInfo = Xmalloc(sz_xInfo);
|
||||
temp_conflict = Xmalloc(sz_xConflict);
|
||||
} else {
|
||||
|
|
|
@ -188,13 +188,14 @@ _xgeGetExtensionVersion(Display* dpy,
|
|||
|
||||
if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
|
||||
{
|
||||
Xfree(info);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vers = Xmalloc(sizeof(XGEVersionRec));
|
||||
vers->major_version = rep.majorVersion;
|
||||
vers->minor_version = rep.minorVersion;
|
||||
if (vers != NULL) {
|
||||
vers->major_version = rep.majorVersion;
|
||||
vers->minor_version = rep.minorVersion;
|
||||
}
|
||||
return vers;
|
||||
}
|
||||
|
||||
|
@ -207,7 +208,7 @@ _xgeDpyClose(Display* dpy, XExtCodes* codes)
|
|||
{
|
||||
XExtDisplayInfo *info = _xgeFindDisplay(dpy);
|
||||
|
||||
if (info->data != NULL) {
|
||||
if (info != NULL && info->data != NULL) {
|
||||
XGEData* xge_data = (XGEData*)info->data;
|
||||
|
||||
if (xge_data->extensions)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue