public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: load_user_profile: chack if we got a valid, known domainname
@ 2019-02-28 22:18 Corinna Vinschen
  0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2019-02-28 22:18 UTC (permalink / raw)
  To: cygwin-cvs

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=5d9ac1291d84d6a6f15efe082d91ae1bf5947ab1

commit 5d9ac1291d84d6a6f15efe082d91ae1bf5947ab1
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Thu Feb 28 23:17:55 2019 +0100

    Cygwin: load_user_profile: chack if we got a valid, known domainname
    
    ...otherwise we may suffer a SEGV because dnsdomain is NULL.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/sec_auth.cc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index a4e7458..c1667f5 100644
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -288,17 +288,22 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
 		break;
 	      }
 	}
-      if (cldap.fetch_ad_account (usersid, false, dnsdomain))
+      if (dnsdomain)
 	{
-	  PWCHAR val = cldap.get_profile_path ();
-	  if (val && *val)
+	  if (cldap.fetch_ad_account (usersid, false, dnsdomain))
 	    {
-	      wcsncpy (userpath, val, MAX_PATH - 1);
-	      userpath[MAX_PATH - 1] = L'\0';
-	      pi.lpProfilePath = userpath;
+	      PWCHAR val = cldap.get_profile_path ();
+	      if (val && *val)
+		{
+		  wcsncpy (userpath, val, MAX_PATH - 1);
+		  userpath[MAX_PATH - 1] = L'\0';
+		  pi.lpProfilePath = userpath;
+		}
 	    }
+	  free (dnsdomain);
 	}
-      free (dnsdomain);
+      else
+	debug_printf ("Unknown domain <%W>?", domain);
     }
 
   if (!LoadUserProfileW (token, &pi))


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-02-28 22:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-28 22:18 [newlib-cygwin] Cygwin: load_user_profile: chack if we got a valid, known domainname Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).