luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent referencing a NULL pointer 

free the loc pointer and NULL its origin STATIC_VAR (locdata)
(that translates to mif_private->inst_var[0]->element[0].pvalue)
This commit is contained in:
Holger Vogt 2019-12-02 21:33:31 +01:00
parent 707936efe3
commit e89a92f944
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xspice/icm/table/mada/eno2.c
View File

@ -72,6 +72,9 @@ sf_eno2_close (sf_eno2 pnt)
{
int i2;
if (!pnt)
return;
sf_eno_close (pnt->jnt);
for (i2 = 0; i2 < pnt->n2; i2++)
sf_eno_close (pnt->ent[i2]);

3
src/xspice/icm/table/mada/eno3.c
View File

@ -78,6 +78,9 @@ sf_eno3_close(sf_eno3 pnt)
{
int i2, i3;
if (!pnt)
return;
sf_eno2_close (pnt->jnt);
for (i3 = 0; i3 < pnt->n3; i3++) {
for (i2 = 0; i2 < pnt->n2; i2++)

15
src/xspice/icm/table/table2D/cfunc.mod
View File

@ -298,6 +298,8 @@ cm_table2D_callback(ARGS, Mif_Callback_Reason_t reason)
case MIF_CB_DESTROY: {
int i;
Local_Data_t *loc = STATIC_VAR (locdata);
if (!loc)
break;
free(loc->state);
for (i = 0; i < loc->iy; i++)
free(loc->table[i]);
@ -306,6 +308,7 @@ cm_table2D_callback(ARGS, Mif_Callback_Reason_t reason)
free(loc->ycol);
sf_eno2_close (loc->newtable);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
break;
}
}
@ -428,8 +431,9 @@ cm_table2D(ARGS) /* structure holding parms, inputs, outputs, etc. */
struct stat st;
if (!loc->state->fp || fstat(fileno(loc->state->fp), &st)) {
cm_message_printf("cannot open file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
return;
}
/* get file length */
@ -441,8 +445,9 @@ cm_table2D(ARGS) /* structure holding parms, inputs, outputs, etc. */
cThisLine = calloc(lFileLen + 1, sizeof(char));
if (cFile == NULL || cThisLine == NULL) {
cm_message_printf("Insufficient memory to read file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
if(cFile) free(cFile);
if(cThisLine) free(cThisLine);
return;
@ -627,7 +632,7 @@ cm_table2D(ARGS) /* structure holding parms, inputs, outputs, etc. */
loc = STATIC_VAR (locdata);
/* return immediately if there was an initialization error */
if (loc->init_err == 1)
if (!loc || loc->init_err == 1)
return;
/* get input x, y,

15
src/xspice/icm/table/table3D/cfunc.mod
View File

@ -304,6 +304,8 @@ cm_table3D_callback(ARGS, Mif_Callback_Reason_t reason)
case MIF_CB_DESTROY: {
int i, j;
Local_Data_t *loc = STATIC_VAR (locdata);
if (!loc)
break;
free(loc->state);
for (i = 0; i < loc->iz; i++) {
@ -317,6 +319,7 @@ cm_table3D_callback(ARGS, Mif_Callback_Reason_t reason)
free(loc->zcol);
sf_eno3_close (loc->newtable);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
break;
}
}
@ -442,8 +445,9 @@ cm_table3D(ARGS) /* structure holding parms, inputs, outputs, etc. */
struct stat st;
if (!loc->state->fp || fstat(fileno(loc->state->fp), &st)) {
cm_message_printf("cannot open file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
return;
}
/* get file length */
@ -455,8 +459,9 @@ cm_table3D(ARGS) /* structure holding parms, inputs, outputs, etc. */
cThisLine = calloc(lFileLen + 1, sizeof(char));
if (cFile == NULL || cThisLine == NULL) {
cm_message_printf("Insufficient memory to read file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
if(cFile) free(cFile);
if(cThisLine) free(cThisLine);
return;
@ -668,7 +673,7 @@ cm_table3D(ARGS) /* structure holding parms, inputs, outputs, etc. */
loc = STATIC_VAR (locdata);
/* return immediately if there was an initialization error */
if (loc->init_err == 1)
if (!loc || loc->init_err == 1)
return;
/* get input x, y, z;