Commit 32affb8a authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

mapi32: Prevent freeing non-allocated memory.

parent 5e3c00fa
...@@ -63,7 +63,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG uiparam, ...@@ -63,7 +63,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG uiparam,
unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0;
unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size;
char *address = "", *to = "", *cc = "", *bcc = "", *subject, *body; char *address = "", *to = NULL, *cc = NULL, *bcc = NULL, *subject, *body;
static const char format[] = static const char format[] =
"mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\"";
char *mailto = NULL, *escape = NULL; char *mailto = NULL, *escape = NULL;
...@@ -173,7 +173,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG uiparam, ...@@ -173,7 +173,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG uiparam,
mailto = HeapAlloc( GetProcessHeap(), 0, size ); mailto = HeapAlloc( GetProcessHeap(), 0, size );
if (!mailto) goto exit; if (!mailto) goto exit;
sprintf( mailto, format, to, subject, cc, bcc, body ); sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body );
size = 0; size = 0;
res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY ); res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment