Ignore domain and workstation in negotiate message

We never use these fields, so do not even attempt to decode them
just ignore completely.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/ntlm.c b/src/ntlm.c
index 3702e4c..d9b3c87 100644
--- a/src/ntlm.c
+++ b/src/ntlm.c
@@ -979,12 +979,14 @@ int ntlm_decode_neg_msg(struct ntlm_ctx *ctx,
 
     neg_flags = le32toh(msg->neg_flags);
 
-    if (neg_flags & NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED) {
+    if (domain &&
+        (neg_flags & NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED)) {
         ret = ntlm_decode_oem_str(&msg->domain_name, buffer,
                                   payload_offs, &dom);
         if (ret) goto done;
     }
-    if (neg_flags & NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED) {
+    if (workstation &&
+        (neg_flags & NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED)) {
         ret = ntlm_decode_oem_str(&msg->workstation_name, buffer,
                                   payload_offs, &wks);
         if (ret) goto done;
@@ -996,8 +998,8 @@ done:
         safefree(wks);
     } else {
         *flags = neg_flags;
-        *domain = dom;
-        *workstation = wks;
+        if (domain) *domain = dom;
+        if (workstation) *workstation = wks;
     }
     return ret;
 }