nullcheck

2 files changed, 10 insertions, 5 deletions

diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index 58e4e722..6740cc23 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -380,12 +380,12 @@ try_ready_normal_body (struct MHD_Connection *connection)
   return MHD_YES;
 }
 
+
 /**
- * Prepare the response buffer of this connection for
- * sending.  Assumes that the response mutex is
- * already held.  If the transmission is complete,
- * this function may close the socket (and return
- * MHD_NO).
+ * Prepare the response buffer of this connection for sending.
+ * Assumes that the response mutex is already held.  If the
+ * transmission is complete, this function may close the socket (and
+ * return MHD_NO).
  *
  * @return MHD_NO if readying the response failed
  */
diff --git a/src/daemon/digestauth.c b/src/daemon/digestauth.c
index dd87b251..72bff56f 100644
--- a/src/daemon/digestauth.c
+++ b/src/daemon/digestauth.c
@@ -690,6 +690,11 @@ MHD_basic_auth_get_username_password(struct MHD_Connection *connection,
       return NULL;
     }
   user = strdup(decode);
+  if (NULL == user)
+    {
+      free (decode);
+      return NULL;
+    }
   user[separator - decode] = '\0'; /* cut off at ':' */
   if (password != NULL) 
     {