Owen Rudge : winemapi: Ensure address is valid before checking for 'smtp:'.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7cd20a413e1ab212f032269e4025aba18d0292af
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7cd20a413e1ab212f032269e40...

Author: Owen Rudge <orudge(a)codeweavers.com>
Date:   Thu Jun  9 16:27:43 2011 +0100

winemapi: Ensure address is valid before checking for 'smtp:'.

---

 dlls/winemapi/sendmail.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c
index e4629bb..93f0569 100644
--- a/dlls/winemapi/sendmail.c
+++ b/dlls/winemapi/sendmail.c
@@ -87,11 +87,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
         }
 
         address = message->lpRecips[i].lpszAddress;
-        if (!strncasecmp(address, smtp, sizeof(smtp) - 1))
-            address += sizeof(smtp) - 1;
 
         if (address)
         {
+            if (!strncasecmp(address, smtp, sizeof(smtp) - 1))
+                address += sizeof(smtp) - 1;
+
             switch (message->lpRecips[i].ulRecipClass)
             {
                 case MAPI_ORIG:
@@ -172,11 +173,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
     for (i = 0; i < message->nRecipCount; i++)
     {
         address = message->lpRecips[i].lpszAddress;
-        if (!strncasecmp(address, smtp, sizeof(smtp) - 1))
-            address += sizeof(smtp) - 1;
 
         if (address)
         {
+            if (!strncasecmp(address, smtp, sizeof(smtp) - 1))
+                address += sizeof(smtp) - 1;
+
             switch (message->lpRecips[i].ulRecipClass)
             {
                 case MAPI_TO: