Skip to content

SUPPORT_DIRECT_MALLOC and SUPPORT_REMOVE_MALLOC_LEGACY #372

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

Open
dlmiles wants to merge 7 commits into
base: master
Choose a base branch
from
Open

SUPPORT_DIRECT_MALLOC and SUPPORT_REMOVE_MALLOC_LEGACY #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f173c0e
SUPPORT_DIRECT_MALLOC and SUPPORT_REMOVE_MALLOC_LEGACY
dlmiles Feb 13, 2025
6022eea
gtTkCommon.c: SUPPORT_DIRECT_MALLOC around function pointer use of le…
dlmiles Feb 13, 2025
9288c44
callocMagic has same API argument convention as calloc()
dlmiles Feb 13, 2025
3728746
scripts/defs.mak.in: FEATURE_FLAGS -DSUPPORT_DIRECT_MALLOC -DSUPPORT_…
dlmiles Feb 13, 2025
9f4dd68
freeMagic1() idiom insertion at all sites reported by static code ana…
dlmiles Feb 13, 2025
fb846ef
EFbuild.c: efConnectionFreeLinkedList() remove delay-by-one assumption
dlmiles Feb 26, 2025
ceedfc1
malloc: remove #pragma weak as MacOS does not like
dlmiles Oct 29, 2025
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
2 changes: 1 addition & 1 deletion bplane/bpBins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static BinArray *bpBinArrayNew(int dx, /* x diameter of bins */

/* allocate array */
size = sizeof(BinArray) + numBins*(sizeof(void *));
new = (BinArray *)callocMagic(size);
new = (BinArray *)callocMagic(1, size);

/* initial */
new->ba_bbox = *bbox;
Expand Down
4 changes: 3 additions & 1 deletion calma/CalmaRdpt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,12 +360,14 @@ calmaElementBoundary(void)
}

/* Paint the rectangles (if any) */
free_magic1_t mm1 = freeMagic1_init();
for (; rp != NULL ; rp = rp->r_next)
{
if (plane)
DBPaintPlane(plane, &rp->r_r, CIFPaintTable, (PaintUndoInfo *)NULL);
freeMagic((char *) rp);
freeMagic1(&mm1, (char *) rp);
}
freeMagic1_end(&mm1);

if (cifCurReadPlanes == cifEditCellPlanes)
{
Expand Down
33 changes: 23 additions & 10 deletions calma/CalmaWrite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,8 +1400,10 @@ calmaOutFunc(
{
pllist[i].pl_label = ll->ll_label;
pllist[i].pl_port = (unsigned int)ll->ll_attr;
freeMagic(ll);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, ll);
ll = ll->ll_next;
freeMagic1_end(&mm1);
i++;
}

Expand Down Expand Up @@ -2422,19 +2424,26 @@ calmaProcessBoundary(

/* Free the LinkedBoundary list */

lbref = listtop;
while (lbref->lb_next != listtop)
{
freeMagic(lbref);
lbref = lbref->lb_next;
free_magic1_t mm1 = freeMagic1_init();
lbref = listtop;
while (lbref->lb_next != listtop)
{
freeMagic1(&mm1, lbref);
lbref = lbref->lb_next;
}
freeMagic1_end(&mm1);
}
freeMagic(lbref);
}

/* Free the BoundaryTop list */

for (bounds = blist; bounds != NULL; bounds = bounds->bt_next)
freeMagic(bounds);
{
free_magic1_t mm1 = freeMagic1_init();
for (bounds = blist; bounds != NULL; bounds = bounds->bt_next)
freeMagic1(&mm1, bounds);
freeMagic1_end(&mm1);
}
}

/*
Expand Down Expand Up @@ -2500,8 +2509,10 @@ calmaMergePaintFunc(
lb = edge;
while (lb->lb_next != edge) lb = lb->lb_next;
lb->lb_next = edge->lb_next;
freeMagic(edge);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, edge);
edge = edge->lb_next;
freeMagic1_end(&mm1);
}
}
else
Expand Down Expand Up @@ -2720,11 +2731,13 @@ calmaMergePaintFunc(

if (num_points != 4)
{
free_magic1_t mm1 = freeMagic1_init();
for (i = 0; i < num_points; i++)
{
freeMagic(edge);
freeMagic1(&mm1, edge);
edge = edge->lb_next;
}
freeMagic1_end(&mm1);
edge = NULL;
}
if (!StackEmpty(SegStack))
Expand Down
33 changes: 23 additions & 10 deletions calma/CalmaWriteZ.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,8 +1324,10 @@ calmaOutFuncZ(
{
pllist[i].pl_label = ll->ll_label;
pllist[i].pl_port = (unsigned int)ll->ll_attr;
freeMagic(ll);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, ll);
ll = ll->ll_next;
freeMagic1_end(&mm1);
i++;
}

Expand Down Expand Up @@ -1857,19 +1859,26 @@ calmaProcessBoundaryZ(

/* Free the LinkedBoundary list */

lbref = listtop;
while (lbref->lb_next != listtop)
{
freeMagic(lbref);
lbref = lbref->lb_next;
free_magic1_t mm1 = freeMagic1_init();
lbref = listtop;
while (lbref->lb_next != listtop)
{
freeMagic1(&mm1, lbref);
lbref = lbref->lb_next;
}
freeMagic1_end(&mm1);
}
freeMagic(lbref);
}

/* Free the BoundaryTop list */

for (bounds = blist; bounds != NULL; bounds = bounds->bt_next)
freeMagic(bounds);
{
free_magic1_t mm1 = freeMagic1_init();
for (bounds = blist; bounds != NULL; bounds = bounds->bt_next)
freeMagic1(&mm1, bounds);
freeMagic1_end(&mm1);
}
}

/*
Expand Down Expand Up @@ -1935,8 +1944,10 @@ calmaMergePaintFuncZ(
lb = edge;
while (lb->lb_next != edge) lb = lb->lb_next;
lb->lb_next = edge->lb_next;
freeMagic(edge);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, edge);
edge = edge->lb_next;
freeMagic1_end(&mm1);
}
}
else
Expand Down Expand Up @@ -2155,11 +2166,13 @@ calmaMergePaintFuncZ(

if (num_points != 4)
{
free_magic1_t mm1 = freeMagic1_init();
for (i = 0; i < num_points; i++)
{
freeMagic(edge);
freeMagic1(&mm1, edge);
edge = edge->lb_next;
}
freeMagic1_end(&mm1);
edge = NULL;
}
if (!StackEmpty(SegStack))
Expand Down
8 changes: 6 additions & 2 deletions cif/CIFgen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2768,8 +2768,10 @@ cifSquaresFillArea(

DBPaintPlane(plane, &stripList->area, CIFEraseTable,
(PaintUndoInfo *) NULL);
freeMagic(stripList);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, stripList);
stripList = stripList->strip_next;
freeMagic1_end(&mm1);
}

/* 2nd pass: Search the plane for unmarked tiles */
Expand Down Expand Up @@ -3110,8 +3112,10 @@ cifSlotsFillArea(

DBPaintPlane(plane, &stripList->area, CIFEraseTable,
(PaintUndoInfo *) NULL);
freeMagic(stripList);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, stripList);
stripList = stripList->strip_next;
freeMagic1_end(&mm1);
}

/* 2nd pass: Search the plane for unmarked tiles */
Expand Down
6 changes: 4 additions & 2 deletions cif/CIFrdcl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,9 +851,11 @@ CIFPaintCurrent(
freeMagic(propstr);
}
propstr = newstr;
freeMagic(lrec);
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, lrec);
lrec = lrec->r_next;
}
freeMagic1_end(&mm1);
}
/* NOTE: propstr is transferred to the CellDef and should
* not be free'd here.
*/
Expand Down
16 changes: 12 additions & 4 deletions cif/CIFrdpt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,18 +338,20 @@ CIFPaintWirePath(
pathp = pathheadp->cifp_next;
if (pathp != NULL)
{
free_magic1_t mm1 = freeMagic1_init();
while (pathp->cifp_next != NULL)
{
if (pathp->cifp_next->cifp_x == pathp->cifp_x &&
pathp->cifp_next->cifp_y == pathp->cifp_y)
{
previousp->cifp_next = pathp->cifp_next;
freeMagic(pathp);
freeMagic1(&mm1, pathp);
}
else
previousp = pathp;
pathp = pathp->cifp_next;
}
freeMagic1_end(&mm1);
}

previousp = pathheadp;
Expand Down Expand Up @@ -486,11 +488,13 @@ CIFPaintWirePath(
rectp = CIFPolyToRects(polypath, plane, ptable, ui, FALSE);
CIFFreePath(polypath);

free_magic1_t mm1 = freeMagic1_init();
for (; rectp != NULL ; rectp = rectp->r_next)
{
DBPaintPlane(plane, &rectp->r_r, ptable, ui);
freeMagic((char *) rectp);
freeMagic1(&mm1, (char *) rectp);
}
freeMagic1_end(&mm1);
polypath = NULL;
}
else
Expand Down Expand Up @@ -588,11 +592,13 @@ PaintPolygon(
rectlist = CIFPolyToRects(cifpath, plane, ptable, ui, FALSE);
CIFFreePath(cifpath);

free_magic1_t mm1 = freeMagic1_init();
for (rectp = rectlist; rectp != NULL ; rectp = rectp->r_next)
{
DBPaintPlane(plane, &rectp->r_r, ptable, ui);
if (!keep) freeMagic((char *) rectp);
if (!keep) freeMagic1(&mm1, (char *) rectp);
}
freeMagic1_end(&mm1);
return (keep) ? rectlist : (LinkedRect *)NULL;
}

Expand Down Expand Up @@ -821,11 +827,13 @@ CIFParsePoly(void)
CIFSkipToSemi();
return FALSE;
}
free_magic1_t mm1 = freeMagic1_init();
for (; rectp != NULL ; rectp = rectp->r_next)
{
DBPaintPlane(cifReadPlane, &rectp->r_r, CIFPaintTable,
(PaintUndoInfo *) NULL);
freeMagic((char *) rectp);
freeMagic1(&mm1, (char *) rectp);
}
freeMagic1_end(&mm1);
return TRUE;
}
8 changes: 6 additions & 2 deletions cif/CIFrdtech.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,10 @@ cifNewReadStyle(void)
layer = cifCurReadStyle->crs_layers[i];
if (layer != NULL)
{
free_magic1_t mm1 = freeMagic1_init();
for (op = layer->crl_ops; op != NULL; op = op->co_next)
freeMagic((char *)op);
freeMagic1(&mm1, (char *)op);
freeMagic1_end(&mm1);
freeMagic((char *)layer);
}
}
Expand Down Expand Up @@ -408,11 +410,13 @@ CIFReadTechInit(void)

/* forget the list of styles */

free_magic1_t mm1 = freeMagic1_init();
for (style = cifReadStyleList; style != NULL; style = style->crs_next)
{
freeMagic(style->crs_name);
freeMagic(style);
freeMagic1(&mm1, style);
}
freeMagic1_end(&mm1);
cifReadStyleList = NULL;
}

Expand Down
4 changes: 3 additions & 1 deletion cif/CIFrdutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,11 +1338,13 @@ void
CIFFreePath(
CIFPath *path) /* Path to be freed. */
{
free_magic1_t mm1 = freeMagic1_init();
while (path != NULL)
{
freeMagic((char *) path);
freeMagic1(&mm1, (char *) path);
path = path->cifp_next;
}
freeMagic1_end(&mm1);
}

/*
Expand Down
8 changes: 6 additions & 2 deletions cif/CIFtech.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ cifTechFreeStyle(void)
layer = CIFCurStyle->cs_layers[i];
if (layer != NULL)
{
free_magic1_t mm1 = freeMagic1_init();
for (op = layer->cl_ops; op != NULL; op = op->co_next)
{
if (op->co_client != (ClientData)NULL)
Expand All @@ -120,8 +121,9 @@ cifTechFreeStyle(void)
break;
}
}
freeMagic((char *)op);
freeMagic1(&mm1, (char *)op);
}
freeMagic1_end(&mm1);
freeMagic((char *)layer);
}
}
Expand Down Expand Up @@ -369,11 +371,13 @@ CIFTechInit(void)

/* forget the list of styles */

free_magic1_t mm1 = freeMagic1_init();
for (style = CIFStyleList; style != NULL; style = style->cs_next)
{
freeMagic(style->cs_name);
freeMagic(style);
freeMagic1(&mm1, style);
}
freeMagic1_end(&mm1);
CIFStyleList = NULL;
}

Expand Down
12 changes: 8 additions & 4 deletions commands/CmdAB.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,11 +530,15 @@ CmdArray(
}

freelist:
la = lahead;
while (la != NULL)
{
freeMagic((char *)la);
la = la->ar_next;
la = lahead;
while (la != NULL)
{
free_magic1_t mm1 = freeMagic1_init();
freeMagic1(&mm1, (char *)la);
la = la->ar_next;
freeMagic1_end(&mm1);
}
}
return;
}
Expand Down
Loading
Loading