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

struct variable, #13/18, reorder var_alloc() invocation

This commit is contained in:
rlar 2016-03-25 15:40:02 +01:00
parent eb53b4d703
commit bf5acda362
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend/variable.c
View File

@ -339,12 +339,13 @@ cp_setparse(wordlist *wl)
if (!--balance) if (!--balance)
break; break;
} }
vv = var_alloc(NULL, NULL);
copyval = ss = cp_unquote(wl->wl_word); copyval = ss = cp_unquote(wl->wl_word);
td = ft_numparse(&ss, FALSE); td = ft_numparse(&ss, FALSE);
if (td) { if (td) {
vv = var_alloc(NULL, NULL);
var_set_real(vv, *td); var_set_real(vv, *td);
} else { } else {
vv = var_alloc(NULL, NULL);
var_set_string(vv, copy(ss)); var_set_string(vv, copy(ss));
} }
tfree(copyval); /*DG: must free ss any way to avoid cp_unquote memory leak*/ tfree(copyval); /*DG: must free ss any way to avoid cp_unquote memory leak*/
@ -374,13 +375,15 @@ cp_setparse(wordlist *wl)
copyval = ss = cp_unquote(val); copyval = ss = cp_unquote(val);
td = ft_numparse(&ss, FALSE); td = ft_numparse(&ss, FALSE);
vv = var_alloc(copy(name), vars);
vars = vv;
if (td) { if (td) {
/*** We should try to get CP_NUM's... */ /*** We should try to get CP_NUM's... */
vv = var_alloc(copy(name), vars);
var_set_real(vv, *td); var_set_real(vv, *td);
vars = vv;
} else { } else {
vv = var_alloc(copy(name), vars);
var_set_string(vv, copy(val)); var_set_string(vv, copy(val));
vars = vv;
} }
tfree(copyval); /*DG: must free ss any way to avoid cp_unquote memory leak */ tfree(copyval); /*DG: must free ss any way to avoid cp_unquote memory leak */
tfree(name); /* va: cp_unquote memory leak: free name for every loop */ tfree(name); /* va: cp_unquote memory leak: free name for every loop */