Attachment #39343 for bug #63577

Lines 1-3 Link Here

(-)smime/ChangeLog (+7 lines)
		1	2004-09-03 Not Zed <NotZed@Ximian.com>
		2
		3	** See bug #64420.
		4
		5	* lib/e-pkcs12.c (prompt_for_password): set the outptr after we've
		6	actually got a pointer for it allocated.
		7
1	2004-08-16 Not Zed <NotZed@Ximian.com>	8	2004-08-16 Not Zed <NotZed@Ximian.com>
2		9
3	** See bug #62963.	10	** See bug #62963.




	if (passwd) {
		size_t len = strlen (passwd);
		const char *inptr = passwd;
		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);

Return to bug 63577

Lines 224-234 Link Here

(-)smime/lib/e-pkcs12.c (-1 / +2 lines)
224	if (passwd) {	224	if (passwd) {
225	size_t len = strlen (passwd);	225	size_t len = strlen (passwd);
226	const char *inptr = passwd;	226	const char *inptr = passwd;
227	char *outptr = pwd->data;	227	char *outptr;
228	gunichar2 c;	228	gunichar2 c;
229		229
230	SECITEM_AllocItem(NULL, pwd, sizeof (gunichar2) * (len + 1));	230	SECITEM_AllocItem(NULL, pwd, sizeof (gunichar2) * (len + 1));
231		231
		232	outptr = pwd->data;
232	while (inptr && (c = (gunichar2) (g_utf8_get_char (inptr) & 0xffff))) {	233	while (inptr && (c = (gunichar2) (g_utf8_get_char (inptr) & 0xffff))) {
233	inptr = g_utf8_next_char (inptr);	234	inptr = g_utf8_next_char (inptr);
234	c = GUINT16_TO_BE (c);	235	c = GUINT16_TO_BE (c);