luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a corruption found by joanne in load_sym_def() where a static result returned from tcl_hook2() was accidentally freed.

This commit is contained in:
stefan schippers 2023-05-04 21:20:58 +02:00
parent f282a96cec
commit 35f4826198
3 changed files with 1932 additions and 1916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3836
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

8
XSchemWin/XSchemWix/xschem_library.wxs
View File

@ -658,6 +658,9 @@
</Component>
</Directory>
<Directory Id="dir0E49847221518A8EA1A21E5E7C2A0013" Name="generators">
<Component Id="cmp25A7C4122212FC7D9EAC62B717AFABD5" Guid="{49B4D4B0-1D23-49E2-9E77-D56BAA874B27}">
<File Id="fil6DAD69B2E89265134875F6363A12D945" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\generators\mosgen" />
</Component>
<Component Id="cmp32465EBB4792AC111E037BC93352D608" Guid="{AF168DB3-7773-4827-9440-A66CE3EC0377}">
<File Id="fil2394C46591EC087671BABBB84C6A7A38" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\generators\my_inv.sch" />
</Component>
@ -670,6 +673,9 @@
<Component Id="cmp58DEF4BE570C94119EE2C3392A79729E" Guid="{4E5077D3-9AD2-4B60-927E-189B490B39BB}">
<File Id="filE5921602E7E3F12690CF1D1BD574EFD9" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\generators\symbolgen" />
</Component>
<Component Id="cmpA817B5B11EE935E104D26D6539BBAC55" Guid="{01B8AB98-B989-4B98-BA56-EE45AF3E5635}">
<File Id="filEA97A0AE18C05A9F29AAD6255329186E" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\generators\test_mosgen.sch" />
</Component>
<Component Id="cmp564B680048CCEDCA705AB3D245A19E30" Guid="{B9DEB694-0240-4CA7-A71A-539F16C39DE4}">
<File Id="filC194343F1D6B4EE6B4AF35363CDA35E4" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\generators\test_symbolgen.sch" />
</Component>
@ -5699,10 +5705,12 @@
<ComponentRef Id="cmp30D416247CB7868426C9E8075767CD1A" />
<ComponentRef Id="cmpB573F1750B3939F980B65D02B78EE0E3" />
<ComponentRef Id="cmp07A884BAD56D6B1718967173C498C3C3" />
<ComponentRef Id="cmp25A7C4122212FC7D9EAC62B717AFABD5" />
<ComponentRef Id="cmp32465EBB4792AC111E037BC93352D608" />
<ComponentRef Id="cmp2FDFB818395E2338E0060D6F28271CE7" />
<ComponentRef Id="cmpD694720EA8D2EEE4E58970628CFBC57A" />
<ComponentRef Id="cmp58DEF4BE570C94119EE2C3392A79729E" />
<ComponentRef Id="cmpA817B5B11EE935E104D26D6539BBAC55" />
<ComponentRef Id="cmp564B680048CCEDCA705AB3D245A19E30" />
<ComponentRef Id="cmpB218B4D54FEA02DE77E9B9650F18D0C6" />
<ComponentRef Id="cmp93CCC992DFDB8670EC1762AF056E9A71" />

4
src/save.c
View File

@ -3155,7 +3155,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
const char *dash;
xSymbol * symbol;
int symbols, sym_n_pins=0, generator;
const char *cmd;
char *cmd = NULL;
if(!name) {
dbg(0, "l_s_d(): Warning: name parameter set to NULL, returning with no action\n");
@ -3171,7 +3171,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
lcc=NULL;
my_realloc(_ALLOC_ID_, &lcc, (level + 1) * sizeof(Lcc));
max_level = level + 1;
cmd = tcl_hook2(name);
my_strdup2(_ALLOC_ID_, &cmd, tcl_hook2(name));
dbg(1, "l_s_d(): cmd=%s\n", cmd);
generator = is_generator(cmd);
if(generator) {