procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix uninit var in widget.c

Browse source 
* src/widget.c (EmacsFrameQueryGeometry):
Avoid use of uninitialized variables ok_width, ok_height (Bug#35277).
This commit is contained in:
Paul Eggert 2019-04-15 20:53:13 -07:00
parent a6b4c3bbeb
commit debaa72dd8
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/widget.c
View file

@ -434,21 +434,20 @@ EmacsFrameResize (Widget widget)
}
static XtGeometryResult
EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *result)
EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request,
XtWidgetGeometry *result)
{
EmacsFrame ew = (EmacsFrame) widget;
int mask = request->request_mode;
Dimension ok_width, ok_height;
if (mask & (CWWidth | CWHeight))
if (mask & (CWWidth | CWHeight) && !frame_resize_pixelwise)
{
if (!frame_resize_pixelwise)
round_size_to_char (ew,
(mask & CWWidth) ? request->width : ew->core.width,
((mask & CWHeight) ? request->height
: ew->core.height),
&ok_width, &ok_height);
EmacsFrame ew = (EmacsFrame) widget;
Dimension ok_width, ok_height;
round_size_to_char (ew,
mask & CWWidth ? request->width : ew->core.width,
mask & CWHeight ? request->height : ew->core.height,
&ok_width, &ok_height);
if ((mask & CWWidth) && (ok_width != request->width))
{
result->request_mode |= CWWidth;