From 3c44d3d4a45b30bfbcd1ecb4e0babc024659f2d0 Mon Sep 17 00:00:00 2001
From: stefanjones <stefanjones>
Date: Mon, 21 Jul 2003 12:18:36 +0000
Subject: [PATCH] Modified Files:   Tag: TCLSPICE  	main.c
 frontend/vectors.c misc/ivars.c  	spicelib/devices/bsim3/b3temp.c

	Fixes from last patch
---
 src/frontend/vectors.c              | 2 --
 src/main.c                          | 6 +++---
 src/misc/ivars.c                    | 4 ++--
 src/spicelib/devices/bsim3/b3temp.c | 5 +++++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 6f61bf561..c4a58aab9 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -621,13 +621,11 @@ vec_free(struct dvec *v)
     }
     }
     tfree(v->v_name);
-    if(v->v_length) {
     if (isreal(v)) {
         tfree(v->v_realdata);
     } else {
         tfree(v->v_compdata);
     }
-    }
     tfree(v);
     return;
 }
diff --git a/src/main.c b/src/main.c
index 53840e5f6..85d7685d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -569,10 +569,10 @@ main(int argc, char **argv)
 
             pw = getpwuid(getuid());
 
-#ifdef HAVE_ASPRINTF
-	    asprintf(&s, "%s/.spiceinit", pw->pw_dir);
-#else /* ~ HAVE_ASPRINTF */
 #define INITSTR "/.spiceinit"
+#ifdef HAVE_ASPRINTF
+	    asprintf(&s, "%s%s", pw->pw_dir,INITSTR);
+#else /* ~ HAVE_ASPRINTF */
 	    s=(char *) tmalloc(1 + strlen(pw->pw_dir)+strlen(INITSTR));
 	    sprintf(s,"%s%s",pw->pw_dir,INITSTR);
 #endif /* HAVE_ASPRINTF */
diff --git a/src/misc/ivars.c b/src/misc/ivars.c
index f100d530b..879c62477 100644
--- a/src/misc/ivars.c
+++ b/src/misc/ivars.c
@@ -42,12 +42,12 @@ mkvar(char **p, char *path_prefix, char *var_dir, char *env_var)
 	asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir);
 #else /* ~ HAVE_ASPRINTF */
     if (buffer){
-	p = (char *) tmalloc(strlen(buffer)+1);
+	*p = (char *) tmalloc(strlen(buffer)+1);
 	sprintf(*p,"%s",buffer);
 	/* asprintf(p, "%s", buffer); */
     }
     else{
-	ip = (char *) tmalloc(strlen(path_prefix) + 
+	*p = (char *) tmalloc(strlen(path_prefix) + 
 			strlen(DIR_PATHSEP) + strlen(var_dir) + 1);
 	sprintf(*p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir); 
 	/* asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir); */
diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c
index 24768997b..9d4a96de5 100644
--- a/src/spicelib/devices/bsim3/b3temp.c
+++ b/src/spicelib/devices/bsim3/b3temp.c
@@ -789,6 +789,11 @@ int Size_Not_Found;
                                      * pParam->BSIM3sqrtPhi;
                   /* End of vfbzb */
               }
+	      else /* !Size_Not_Found */
+	      {
+		  /* va: pParam might be uninitialized, if !Size_Not_Found */
+		  pParam = here->pParam;
+	      }
 
               /* process source/drain series resistance */
               here->BSIM3drainConductance = model->BSIM3sheetResistance