aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
Diffstat (limited to 'smime')
-rw-r--r--smime/ChangeLog7
-rw-r--r--smime/lib/e-pkcs12.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 2e0e2da083..b832cc3a63 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-03 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #64420.
+
+ * lib/e-pkcs12.c (prompt_for_password): set the outptr after we've
+ actually got a pointer for it allocated.
+
2004-08-16 Not Zed <NotZed@Ximian.com>
** See bug #62963.
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index b6001382ed..b2e8e16698 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -224,11 +224,12 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd)
if (passwd) {
size_t len = strlen (passwd);
const char *inptr = passwd;
- char *outptr = pwd->data;
+ char *outptr;
gunichar2 c;
SECITEM_AllocItem(NULL, pwd, sizeof (gunichar2) * (len + 1));
+ outptr = pwd->data;
while (inptr && (c = (gunichar2) (g_utf8_get_char (inptr) & 0xffff))) {
inptr = g_utf8_next_char (inptr);
c = GUINT16_TO_BE (c);