From: Henrik Olsson <henrik@fixme.se>
Date: Sun, 6 Jul 2014 11:36:07 +0000 (+0200)
Subject: Prevent crash in passwordgood when supplied password is one character long
X-Git-Tag: v1.6.1-roc-dev~56^2~1^2
X-Git-Url: https://skyeroc.xyz/gitweb/?a=commitdiff_plain;h=956ec310e8a83db8ef89e27578a4470de980fc8d;p=dgamelaunch

Prevent crash in passwordgood when supplied password is one character long
---

diff --git a/dgamelaunch.c b/dgamelaunch.c
index fbf6ef5..d6f3ee6 100644
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -2051,9 +2051,13 @@ newuser ()
 int
 passwordgood (char *cpw)
 {
+  char *crypted;
   assert (me != NULL);
 
-  if (!strncmp (crypt (cpw, cpw), me->password, DGL_PASSWDLEN))
+  crypted = crypt (cpw, cpw);
+  if (crypted == NULL)
+      return 0;
+  if (!strncmp (crypted, me->password, DGL_PASSWDLEN))
     return 1;
   if (!strncmp (cpw, me->password, DGL_PASSWDLEN))
     return 1;