Skip to content

Commit e9db9ec

Browse files
Another correction that avoids a crash condition when attempting
to do an instance array resizing on an uneditable cell.
1 parent cf5fd86 commit e9db9ec

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.3.484
1+
8.3.485

database/DBcellcopy.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,8 @@ DBCellCopyAllCells(scx, xMask, targetUse, pArea)
17251725

17261726
/* dbCellCopyCellsFunc() allows cells to be left with duplicate IDs */
17271727
/* so generate unique IDs as needed now. */
1728-
DBGenerateUniqueIds(targetUse->cu_def, FALSE);
1728+
1729+
if (targetUse != NULL) DBGenerateUniqueIds(targetUse->cu_def, FALSE);
17291730
}
17301731

17311732
/*

select/selCreate.c

+8-5
Original file line numberDiff line numberDiff line change
@@ -1247,11 +1247,14 @@ SelectAndCopy2(newSourceDef)
12471247
(void) DBCellCopyAllCells(&scx, CU_DESCEND_SPECIAL, EditCellUse, (Rect *) NULL);
12481248
GeoTransRect(&scx.scx_trans, &scx.scx_area, &editArea);
12491249

1250-
DBAdjustLabels(EditCellUse->cu_def, &editArea);
1251-
DBWAreaChanged(EditCellUse->cu_def, &editArea, DBW_ALLWINDOWS,
1252-
(TileTypeBitMask *) NULL);
1253-
DRCCheckThis(EditCellUse->cu_def, TT_CHECKPAINT, &editArea);
1254-
DBReComputeBbox(EditCellUse->cu_def);
1250+
if (EditCellUse != NULL)
1251+
{
1252+
DBAdjustLabels(EditCellUse->cu_def, &editArea);
1253+
DBWAreaChanged(EditCellUse->cu_def, &editArea, DBW_ALLWINDOWS,
1254+
(TileTypeBitMask *) NULL);
1255+
DRCCheckThis(EditCellUse->cu_def, TT_CHECKPAINT, &editArea);
1256+
DBReComputeBbox(EditCellUse->cu_def);
1257+
}
12551258

12561259
SelectRootDef = newSourceDef;
12571260
SelSetDisplay(SelectUse, SelectRootDef);

0 commit comments

Comments
 (0)