summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2011-01-26 23:19:54 +0000
committerforsyth <forsyth@vitanuova.com>2011-01-26 23:19:54 +0000
commit1bac27a017044233fed22aae84accfa9cf48d0c2 (patch)
treea7a21669d78ad844abfafb61e70cd5f8c3aff766
parent265f6ef7b26708082e46bc6f4fb9d9dee6410b88 (diff)
20110126-2319
-rw-r--r--CHANGES2
-rw-r--r--emu/MacOSX/os.c2
-rw-r--r--include/version.h2
-rw-r--r--libinterp/crypt.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 04f7f0a8..1b0d59bd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110126
+ emu/MacOSX/os.c - move a free to a more sensible place
20110117
emu/Nt/ipif.c changed to work with ipv6 interface changes
20110116
diff --git a/emu/MacOSX/os.c b/emu/MacOSX/os.c
index 10a3cf0f..0b161e50 100644
--- a/emu/MacOSX/os.c
+++ b/emu/MacOSX/os.c
@@ -96,8 +96,8 @@ pexit(char *msg, int t)
closepgrp(e->pgrp);
closeegrp(e->egrp);
closesigs(e->sigs);
+ free(e->user);
}
- free(e->user);
free(p->prog);
sem = p->os;
if(sem != nil){
diff --git a/include/version.h b/include/version.h
index f092c2ad..6f3440f2 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20110117)"
+#define VERSION "Fourth Edition (20110126)"
diff --git a/libinterp/crypt.c b/libinterp/crypt.c
index 998e6d91..ae6d8575 100644
--- a/libinterp/crypt.c
+++ b/libinterp/crypt.c
@@ -46,8 +46,6 @@ static uchar RSAskmap[] = Crypt_SK_RSA_map;
static uchar RSApkmap[] = Crypt_PK_RSA_map;
static uchar RSAsigmap[] = Crypt_PKsig_RSA_map;
-static char exBadSK[] = "bad secret key";
-static char exBadPK[] = "bad public key";
static char exBadBsize[] = "data not multiple of block size";
static char exBadKey[] = "bad encryption key";
static char exBadDigest[] = "bad digest value";