luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-10-06 09:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modified the "box" command to run a check on the specified box values

Browse Source 
and raise an error if the values are outside the range (MINFINITY,
INFINITY) used by magic's layout planes.
This commit is contained in:
Tim Edwards
2022-01-27 16:57:23 -05:00
parent 45bb62de2f
commit 62c8af719c
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
8.3.262
8.3.263
commands/CmdAB.c
+14 -1
View File
@@ -615,7 +615,7 @@ CmdBox(w, cmd)
};
CellDef *rootBoxDef;
Rect rootBox, editbox, *boxptr;
Rect rootBox, editbox, savebox, *boxptr;
Point ll;
int option, direction, distancex, distancey;
int width, height;
@@ -756,6 +756,7 @@ CmdBox(w, cmd)
/*----------------------------------------------------------*/
boxptr = (refEdit) ? &editbox : &rootBox;
savebox = *boxptr;
/*----------------------------------------------------------*/
/* Parse arguments according to class */
@@ -1167,6 +1168,18 @@ badusage:
if (refEdit)
GeoTransRect(&EditToRootTransform, &editbox, &rootBox);
/*----------------------------------------------------------*/
/* Check for numerical overflow in box values */
/*----------------------------------------------------------*/
if (boxptr->r_ll.p_x < (MINFINITY + 2) || boxptr->r_ll.p_x > (INFINITY - 2) ||
boxptr->r_ll.p_y < (MINFINITY + 2) || boxptr->r_ll.p_y > (INFINITY - 2))
{
*boxptr = savebox;
TxError("Box out of bounds.\n");
return;
}
/*----------------------------------------------------------*/
/* Change the position of the box in the layout window */
/*----------------------------------------------------------*/